Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 5605caa096941fbf1e42902c3228aab1f8aa3a14..e4f90d68c8fd7940793d272f36c52c41ff28159d 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -23,6 +23,7 @@ SET(vv_TOOLS
   vvToolMIP
   vvToolConvert ## with dummy vvToolConvert.ui
   vvToolROIManager
+  vvToolSegmentation
 
   ## these ones are for tests (not working)
   # vvToolFoo
@@ -100,6 +101,7 @@ SET(vv_SRCS
   vvBlendImageActor.cxx
   vvToolManager.cxx
   vvToolCreatorBase.cxx
+  vvToolBaseBase.cxx
 )
 
 #=========================================================
@@ -205,9 +207,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})
@@ -225,7 +237,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)
@@ -237,7 +249,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)