Updated version for new release

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 320e1948b4c52c09cc451ff3f3cc4e4bc3ab791a..c706b0dd16bfe1c8b91268e60a453f55eb0ad3a0 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -22,7 +22,8 @@ SET(vv_TOOLS
   vvToolStructureSetManager
   vvToolMIP
   vvToolConvert ## with dummy vvToolConvert.ui
-  
+  vvToolROIManager
+
   ## these ones are for tests (not working)
   # vvToolFoo
   # vvToolFooWithWidgetBase
@@ -99,6 +100,7 @@ SET(vv_SRCS
   vvBlendImageActor.cxx
   vvToolManager.cxx
   vvToolCreatorBase.cxx
+  vvToolBaseBase.cxx
 )
 
 #=========================================================
@@ -204,9 +206,19 @@ endforeach(tool)
 #on them)
 SET(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
 
+#=========================================================
+# Use CxImage to create animated gifs
+IF(CLITK_EXPERIMENTAL)
+  SET(vvCxImage clitkCxImage)
+  SET(vv_SRCS ${vv_SRCS} vvAnimatedGIFWriter.cxx)
+  INCLUDE_DIRECTORIES(${CLITK_SOURCE_DIR}/utilities/CxImage)
+  ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/utilities/CxImage ${PROJECT_BINARY_DIR}/utilities/CxImage)
+ENDIF(CLITK_EXPERIMENTAL)
+#=========================================================
+
 #=========================================================
 #Create binary and libs for tests
-SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries})
+SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries} ${vvCxImage})
 # QtNetwork is required by vvRegisterForm
 
 ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX})
@@ -224,7 +236,7 @@ TARGET_LINK_LIBRARIES(vv vvLib)
 
 #=========================================================
 # Install options (also used by CPack)
-IF(UNIX AND NOT APPLE)
+IF(UNIX OR APPLE)
   SET_TARGET_PROPERTIES(vv
     PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}")
   INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
@@ -236,7 +248,7 @@ IF(UNIX AND NOT APPLE)
   #          RENAME "lib${LIB}.so.${QT_VERSION_MAJOR}"
   #          DESTINATION .)
   #ENDFOREACH(LIB)
-ENDIF(UNIX AND NOT APPLE)
+ENDIF(UNIX OR APPLE)
 
 IF(WIN32)
   #INCLUDE(InstallRequiredSystemLibraries)
@@ -254,8 +266,8 @@ SET(CPACK_PACKAGE_VENDOR "Creatis-CLB")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "2")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
 SET(CPACK_STRIP_FILES TRUE)