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

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index e76b094..8ecd3cc 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -7,54 +7,76 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 #=========================================================
 
+
+#=========================================================
 #List of vv tools to compile
 SET(vv_TOOLS
-  vvToolWidgetBase
-#  vvToolWidgetWithStepsBase
   vvToolMedianFilter
-  vvToolRigidReg
-#  vvToolFoo
-#  vvToolFooWithWidgetBase
+#  vvToolRigidReg ## Very long to compile
   vvToolCropImage
   vvToolBinarize
-  vvToolSimpleInputSelectorWidget
-  vvToolInputSelectorWidget
   vvToolImageArithm
-  vvToolStructureSetManager
   vvToolResample
-  vvToolExtractPatient
-  vvToolExtractLung
+#   vvToolExtractPatient
+#  vvToolExtractLung
+  vvToolStructureSetManager
+  vvToolMIP
+  vvToolConvert ## with dummy vvToolConvert.ui
+  
+  ## these ones are for tests (not working)
+  # vvToolFoo
+  # vvToolFooWithWidgetBase
   # vvToolPlastimatch
-#  vvToolConnectedComponentLabeling
+  # vvToolConnectedComponentLabeling  
 )
-#dependencies of the 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)
+SET(vvToolExtractPatient_LIBS clitkSegmentationGgoLib)
+SET(vvToolExtractLung_LIBS clitkSegmentationGgoLib)
+SET(vvToolCropImage_LIBS clitkCropImageLib)
+SET(vvToolMIP_LIBS clitkMIPLib)
+SET(vvToolMedianFilter_LIBS clitkMedianImageFilterLib)
+SET(vvToolImageArithm_LIBS clitkImageArithmImageLib)
 
 #=========================================================
 # List of vv source files
+
+# in COMMON_WITH_UI -> must have .h and .cxx and .ui
+SET(vv_COMMON_WITH_UI
+  vvInfoPanel
+  vvMainWindow 
+  vvLinkPanel 
+  vvOverlayPanel 
+  vvLandmarksPanel 
+  vvProgressDialog 
+  vvSegmentationDialog
+  vvSurfaceViewerDialog
+  vvDeformationDialog
+  vvStructSelector
+  vvIntensityValueSlider
+  vvLabelImageLoaderWidget
+  vvToolWidgetBase  
+  vvToolSimpleInputSelectorWidget
+  vvToolInputSelectorWidget
+  vvRegisterForm
+)
+
+# All others sources
 SET(vv_SRCS
-  vvInfoPanel.cxx
-  vvLinkPanel.cxx
-  vvOverlayPanel.cxx
-  vvLandmarksPanel.cxx
   vvQProgressDialogITKCommand.cxx
   vvQDicomSeriesSelector.cxx
   QTreePushButton.cxx
-  vvSegmentationDialog.cxx
-  vvSurfaceViewerDialog.cxx
   vvMainWindowBase.cxx
-  vvMainWindow.cxx
-  vvProgressDialog.cxx
-  vvDeformationDialog.cxx
   vvImageWarp.cxx
   vvDeformableRegistration.cxx
   vtkVOXImageWriter.cxx
   vvInteractorStyleNavigator.cxx
   vvSlicer.cxx
-  vvImageReader.cxx
-  vvImageReader.txx
-  vvImageWriter.cxx
-  vvImageWriter.txx
   vvLandmarks.cxx
   vvLandmarksGlyph.cxx
   vvGlyphSource.cxx
@@ -62,86 +84,74 @@ SET(vv_SRCS
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
   vvUtils.cxx
-  vvMaximumIntensityProjection.cxx
+#  vvMaximumIntensityProjection.cxx
   vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
-  vvStructSelector.cxx
   vvMidPosition.cxx
   vvImageMapToWLColors.cxx
-  vvIntensityValueSlider.cxx
   vvThreadedFilter.cxx
   vvImageContour.cxx
   vvBinaryImageOverlayActor.cxx
   vvStructureSetActor.cxx
+  vvSaveState.cxx
+  vvReadState.cxx
   vvROIActor.cxx
   vvBlendImageActor.cxx
-  vvLabelImageLoaderWidget.cxx
   vvToolManager.cxx
   vvToolCreatorBase.cxx
-  vvToolConvert.cxx
 )
 
-#=========================================================
-
 #=========================================================
 # Qt related commands
 FIND_PACKAGE(Qt4 REQUIRED)
 
 QT4_WRAP_CPP(vv_SRCS 
   vvMainWindowBase.h 
-  vvMainWindow.h 
   QTreePushButton.h 
-  vvInfoPanel.h 
-  vvLinkPanel.h 
-  vvOverlayPanel.h 
-  vvLandmarksPanel.h 
   vvDocumentation.h  
   vvHelpDialog.h  
-  vvProgressDialog.h 
   vvQDicomSeriesSelector.h 
-  vvSegmentationDialog.h
-  vvSurfaceViewerDialog.h
-  vvDeformationDialog.h
   vvSlicerManager.h
-  vvStructSelector.h
-  vvIntensityValueSlider.h
   vvThreadedFilter.h
   vvStructureSetActor.h
   vvROIActor.h
-  vvLabelImageLoaderWidget.h
   vvToolCreatorBase.h
-  vvToolConvert.h
   )
 
 QT4_WRAP_UI(vv_UI_CXX 
-  qt_ui/vvMainWindow.ui 
-  qt_ui/vvInfoPanel.ui 
-  qt_ui/vvLinkPanel.ui 
-  qt_ui/vvOverlayPanel.ui 
-  qt_ui/vvLandmarksPanel.ui 
   qt_ui/vvHelpDialog.ui 
   qt_ui/vvDocumentation.ui 
-  qt_ui/vvProgressDialog.ui 
   qt_ui/vvDicomSeriesSelector.ui 
-  qt_ui/vvSegmentationDialog.ui
-  qt_ui/vvSurfaceViewerDialog.ui
-  qt_ui/vvDeformationDialog.ui
-  qt_ui/vvStructSelector.ui
   qt_ui/vvDummyWindow.ui #For testing
-  qt_ui/vvIntensityValueSlider.ui
-  qt_ui/vvLabelImageLoaderWidget.ui
   )
 
 QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 
-#Add the autotools
-foreach(tool ${vv_TOOLS})
+# Add the autotools in the header vvToolsList.h for initialization of the dummy
+# variables in vv.cxx for the tools contained in vvLib
+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)
+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})
     SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
     QT4_WRAP_CPP(vv_SRCS ${tool}.h)
     QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
 endforeach(tool)
 
+# Add the common source files
+foreach(tool ${vv_COMMON})
+    SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
+    QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+endforeach(tool)
+
 # if Windows and Qt was built as a static lib then don't set QT_DLL flag
 SET(QT_STATIC 0)
 IF (WIN32)
@@ -170,11 +180,11 @@ INCLUDE_DIRECTORIES(
 
 #=========================================================
 #support for parallel deformable registration with OpenMP
-IF(NOT __APPLE__)
+IF(NOT APPLE)
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
-ENDIF(NOT __APPLE__)
+ENDIF(NOT APPLE)
 #=========================================================
 
 #=========================================================
@@ -184,40 +194,42 @@ INCLUDE_DIRECTORIES(
   ../segmentation
   )
 
-IF(WIN32)
-  SET(EXE_ICON vvIcon.rc)
-ENDIF(WIN32)
-
-LINK_DIRECTORIES(${QT_INCLUDES})
-ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON})
-ADD_DEPENDENCIES(vv clitkToolsGgoLib clitkSegmentationGgoLib)
-TARGET_LINK_LIBRARIES(vv clitkDicomRTStruct 
-#Libs for generic filters with long compilation times
-clitkImageConvertLib 
-clitkImageResampleLib
-clitkBinarizeImageLib
-#Libs for _ggo.c files
-clitkSegmentationGgoLib clitkToolsGgoLib
-clitkRegistrationGgoLib
-)
-
+LINK_DIRECTORIES(${QT_LIBRARY_DIR})
 #=========================================================
 #Add each tool's dependencies
 foreach(tool ${vv_TOOLS})
-    target_link_libraries(vv ${${tool}_LIBS})
+  SET(toolLibs ${toolLibs} ${${tool}_LIBS})
 endforeach(tool)
-
 #=========================================================
 #Add Foundation Libraries (this should be after our libraries, since we depend
 #on them)
-TARGET_LINK_LIBRARIES(vv
-clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
+SET(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
+
+#=========================================================
+#Create binary and libs for tests
+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})
+
+IF(WIN32)
+  ADD_EXECUTABLE(vv WIN32 vv.cxx vvIcon.rc)
+ELSE(WIN32)
+  ADD_EXECUTABLE(vv vv.cxx)
+ENDIF(WIN32)
+
+#TARGET_LINK_LIBRARIES(vv vvLib)
+TARGET_LINK_LIBRARIES(vv vvLib)
+
 
 #=========================================================
 # Install options (also used by CPack)
 IF(UNIX AND NOT APPLE)
-  INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}/vv DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
-  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)
+  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)
+  #  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)
 
   #QT
   #FOREACH(LIB QtCore QtGui QtOpenGL QtNetwork QtSql)
@@ -243,9 +255,10 @@ 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 "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
+SET(CPACK_STRIP_FILES TRUE)
 
 IF(WIN32)
   # There is a bug in NSI that does not handle full unix paths properly. Make
@@ -266,3 +279,6 @@ ELSE(WIN32)
 ENDIF(WIN32)
 INCLUDE(CPack)
 #=========================================================
+#=========================================================
+configure_file(vvConfiguration.h.in vvConfiguration.h)
+#=========================================================