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
+# vvToolExtractPatient
+# vvToolExtractLung
+ vvToolStructureSetManager
+ vvToolMIP
vvToolConvert ## with dummy vvToolConvert.ui
## these ones are for tests (not working)
)
# dependencies of the tools
# Future issues : when tool depend on other tools ... how to manage that ?
-SET(vvToolRigidReg_LIBS clitkAffineRegistrationLib clitkRegistrationGgoLib)
+# >> add the relevant $_LIBS variable to the tool that has dependencies?
SET(vvToolBinarize_LIBS clitkBinarizeImageLib)
-SET(vvToolResample_LIBS clitkImageResampleLib)
+SET(vvToolResample_LIBS clitkResampleImageLib)
SET(vvToolConvert_LIBS clitkImageConvertLib)
SET(vvToolExtractPatient_LIBS clitkSegmentationGgoLib)
SET(vvToolExtractLung_LIBS clitkSegmentationGgoLib)
-SET(vvToolCropImage_LIBS clitkToolsGgoLib)
+SET(vvToolCropImage_LIBS clitkCropImageLib)
+SET(vvToolMIP_LIBS clitkMIPLib)
+SET(vvToolMedianFilter_LIBS clitkMedianImageFilterLib)
+SET(vvToolImageArithm_LIBS clitkImageArithmImageLib)
#=========================================================
# List of vv source files
vvToolWidgetBase
vvToolSimpleInputSelectorWidget
vvToolInputSelectorWidget
- vvToolStructureSetManager
+ vvRegisterForm
)
# All others sources
vtkVOXImageWriter.cxx
vvInteractorStyleNavigator.cxx
vvSlicer.cxx
- vvImageReader.cxx
- vvImageReader.txx
- vvImageWriter.cxx
- vvImageWriter.txx
vvLandmarks.cxx
vvLandmarksGlyph.cxx
vvGlyphSource.cxx
vvSlicerManager.cxx
vvSlicerManagerCommand.cxx
vvUtils.cxx
- vvMaximumIntensityProjection.cxx
+# vvMaximumIntensityProjection.cxx
vvMesh.cxx
vvMeshActor.cxx
vvMeshReader.cxx
vvImageContour.cxx
vvBinaryImageOverlayActor.cxx
vvStructureSetActor.cxx
+ vvSaveState.cxx
+ vvReadState.cxx
vvROIActor.cxx
vvBlendImageActor.cxx
vvToolManager.cxx
QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
-#Add the autotools and the common files ui
+# 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
+# Add the common source files
foreach(tool ${vv_COMMON})
SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
QT4_WRAP_CPP(vv_SRCS ${tool}.h)
#=========================================================
#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)
#=========================================================
#=========================================================
../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)
-
+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)
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
ENDIF(WIN32)
INCLUDE(CPack)
#=========================================================
+#=========================================================
+configure_file(vvConfiguration.h.in vvConfiguration.h)
+#=========================================================