X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FCMakeLists.txt;h=ccfe267078ef37e5d43e3f994fbd6c715dd86b70;hb=55d19655c84d7dbad602fa351bd7404cf214c3de;hp=ec1529e310227620d5390e5aba827a9690530242;hpb=8c55f22bbf246ee2d2deab4ff81c5fdea36851c2;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index ec1529e..ccfe267 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -12,14 +12,14 @@ endif(COMMAND cmake_policy)
 #List of vv tools to compile
 SET(vv_TOOLS
   vvToolMedianFilter
-#  vvToolRigidReg ## Very long to compile
+  vvToolRigidReg
   vvToolCropImage
   vvToolBinarize
   vvToolImageArithm
   vvToolResample
 #   vvToolExtractPatient
 #  vvToolExtractLung
-#vvToolStructureSetManager
+  vvToolStructureSetManager
   vvToolMIP
   vvToolConvert ## with dummy vvToolConvert.ui
   
@@ -32,7 +32,6 @@ SET(vv_TOOLS
 # dependencies of the tools
 # Future issues : when tool depend on other tools ... how to manage that ?
 #  >> add the relevant $_LIBS variable to the tool that has dependencies?
-SET(vvToolRigidReg_LIBS clitkAffineRegistrationLib)
 SET(vvToolBinarize_LIBS clitkBinarizeImageLib)
 SET(vvToolResample_LIBS clitkResampleImageLib)
 SET(vvToolConvert_LIBS clitkImageConvertLib)
@@ -93,7 +92,9 @@ SET(vv_SRCS
   vvThreadedFilter.cxx
   vvImageContour.cxx
   vvBinaryImageOverlayActor.cxx
-  #vvStructureSetActor.cxx
+  vvStructureSetActor.cxx
+  vvSaveState.cxx
+  vvReadState.cxx
   vvROIActor.cxx
   vvBlendImageActor.cxx
   vvToolManager.cxx
@@ -112,7 +113,7 @@ QT4_WRAP_CPP(vv_SRCS
   vvQDicomSeriesSelector.h 
   vvSlicerManager.h
   vvThreadedFilter.h
-  #vvStructureSetActor.h
+  vvStructureSetActor.h
   vvROIActor.h
   vvToolCreatorBase.h
   )
@@ -128,12 +129,14 @@ QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 
 # Add the autotools in the header vvToolsList.h for initialization of the dummy
 # variables in vv.cxx for the tools contained in vvLib
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
-foreach(tool ${vv_TOOLS})
+if(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
+  file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
+  foreach(tool ${vv_TOOLS})
     FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "#include \"${tool}.h\"\n")
     FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "extern const vvToolCreator<${tool}> *dummy${tool};\n")
     FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "const vvToolCreator<${tool}> *dummy${tool}2 = dummy${tool};\n\n")
-endforeach(tool)
+  endforeach(tool)
+endif(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
 
 # Add the autotools and the common files ui
 foreach(tool ${vv_TOOLS} ${vv_COMMON_WITH_UI})
@@ -221,7 +224,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)
@@ -233,7 +236,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)