X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=8ecd3ccb0db23a27a7b7185e7d160fd53650fc1e;hb=5a7da4aedae5c204bc55c187717193e5950f9a44;hp=f20765db15245d06d899cfe091f7541e60f6a627;hpb=ffd7e9a2b669c2f444f652b866851ac87459c7df;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index f20765d..8ecd3cc 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -94,6 +94,8 @@ SET(vv_SRCS
   vvImageContour.cxx
   vvBinaryImageOverlayActor.cxx
   vvStructureSetActor.cxx
+  vvSaveState.cxx
+  vvReadState.cxx
   vvROIActor.cxx
   vvBlendImageActor.cxx
   vvToolManager.cxx
@@ -128,12 +130,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})
@@ -203,7 +207,8 @@ SET(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
 
 #=========================================================
 #Create binary and libs for tests
-SET(vvExternalLibs clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries})
+SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries})
+# QtNetwork is required by vvRegisterForm
 
 ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX})
 TARGET_LINK_LIBRARIES(vvLib ${vvExternalLibs})
@@ -215,15 +220,14 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 #TARGET_LINK_LIBRARIES(vv vvLib)
-# QtNetwork added specifically for Fedora build
-TARGET_LINK_LIBRARIES(vv vvLib QtNetwork)
+TARGET_LINK_LIBRARIES(vv vvLib)
 
 
 #=========================================================
 # Install options (also used by CPack)
 IF(UNIX AND NOT APPLE)
   SET_TARGET_PROPERTIES(vv
-    PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
+    PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}")
   INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
   #  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)