X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=acbc86ce05e09ea7f35e59296f6840933db398dd;hb=0a5abf9398aa0c578f014b52ca992943ca653f72;hp=3a12e03553284530d580793a9b541624a0319982;hpb=b7c0103ffcb88cd6dc1458fec00fc2d7077e48ea;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 3a12e03..acbc86c 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -7,7 +7,6 @@ if(COMMAND cmake_policy) endif(COMMAND cmake_policy) #========================================================= - #========================================================= #List of vv tools to compile SET(vv_TOOLS @@ -17,18 +16,19 @@ SET(vv_TOOLS vvToolBinarize vvToolImageArithm vvToolResample -# vvToolExtractPatient -# vvToolExtractLung - vvToolStructureSetManager vvToolMIP vvToolConvert ## with dummy vvToolConvert.ui vvToolROIManager - + vvToolSegmentation ## these ones are for tests (not working) # vvToolFoo # vvToolFooWithWidgetBase # vvToolPlastimatch # vvToolConnectedComponentLabeling + ## these ones are old ones + # vvToolExtractPatient + # vvToolExtractLung + # vvToolStructureSetManager ) # dependencies of the tools # Future issues : when tool depend on other tools ... how to manage that ? @@ -42,6 +42,7 @@ SET(vvToolCropImage_LIBS clitkCropImageLib) SET(vvToolMIP_LIBS clitkMIPLib) SET(vvToolMedianFilter_LIBS clitkMedianImageFilterLib) SET(vvToolImageArithm_LIBS clitkImageArithmImageLib) +SET(vvToolROIManager_LIBS clitkDicomRTStruct) #========================================================= # List of vv source files @@ -85,13 +86,10 @@ SET(vv_SRCS vvSlicerManager.cxx vvSlicerManagerCommand.cxx vvUtils.cxx -# vvMaximumIntensityProjection.cxx - vvMesh.cxx +# vvMaximumIntensityProjection.cxx vvMesh.cxx vvMeshActor.cxx vvMeshReader.cxx vvMidPosition.cxx - vvImageMapToWLColors.cxx - vvThreadedFilter.cxx vvImageContour.cxx vvBinaryImageOverlayActor.cxx vvStructureSetActor.cxx @@ -115,7 +113,6 @@ QT4_WRAP_CPP(vv_SRCS vvHelpDialog.h vvQDicomSeriesSelector.h vvSlicerManager.h - vvThreadedFilter.h vvStructureSetActor.h vvROIActor.h vvToolCreatorBase.h @@ -124,12 +121,23 @@ QT4_WRAP_CPP(vv_SRCS QT4_WRAP_UI(vv_UI_CXX qt_ui/vvHelpDialog.ui qt_ui/vvDocumentation.ui - qt_ui/vvDicomSeriesSelector.ui - qt_ui/vvDummyWindow.ui #For testing - ) + qt_ui/vvDicomSeriesSelector.ui +qt_ui/vvDummyWindow.ui #For testing ) QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc) +# Add DICOM SERVER gui selector if the adequate GDCM is available +#IF(CLITK_USE_SYSTEM_GDCM) +message("ololoa") + SET(vv_SRCS ${vv_SRCS} + vvQPacsConnection.cxx + vvPacsSettingsDialog.cxx) + QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.cxx + vvPacsSettingsDialog.cxx) + QT4_WRAP_UI(vv_UI_CXX qt_ui/vvPacsConnection.ui + qt_ui/vvPacsSettingsDialog.ui) +#ENDIF(CLITK_USE_SYSTEM_GDCM) + # 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) @@ -143,15 +151,15 @@ endif(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_B # 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) + 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) + 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 @@ -197,11 +205,13 @@ INCLUDE_DIRECTORIES( ) LINK_DIRECTORIES(${QT_LIBRARY_DIR}) + #========================================================= #Add each tool's dependencies foreach(tool ${vv_TOOLS}) SET(toolLibs ${toolLibs} ${${tool}_LIBS}) endforeach(tool) + #========================================================= #Add Foundation Libraries (this should be after our libraries, since we depend #on them) @@ -219,7 +229,7 @@ ENDIF(CLITK_EXPERIMENTAL) #========================================================= #Create binary and libs for tests -SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries} ${vvCxImage}) +SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage}) # QtNetwork is required by vvRegisterForm ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX}) @@ -231,31 +241,12 @@ 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 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) - # INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) - - #QT - #FOREACH(LIB QtCore QtGui QtOpenGL QtNetwork QtSql) - # INSTALL(FILES "${QT_LIBRARY_DIR}/lib${LIB}.so.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}" - # RENAME "lib${LIB}.so.${QT_VERSION_MAJOR}" - # DESTINATION .) - #ENDFOREACH(LIB) -ENDIF(UNIX OR APPLE) +INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) -IF(WIN32) - #INCLUDE(InstallRequiredSystemLibraries) - INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/vv.exe DESTINATION .) - #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) -ENDIF(WIN32) #========================================================= #========================================================= @@ -269,7 +260,11 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt") SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "0") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") +IF(NIGHTLY) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv-nightly") +ELSE(NIGHTLY) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") +ENDIF(NIGHTLY) SET(CPACK_STRIP_FILES TRUE) IF(WIN32) @@ -277,11 +272,15 @@ IF(WIN32) # sure there is at least one set of four (4) backlasshes. SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\icons\\\\ducky.ico") SET(CPACK_NSIS_INSTALLED_ICON_NAME "vv.exe") +IF(NIGHTLY) + SET(CPACK_NSIS_DISPLAY_NAME "vv - The 4D slicer (nightly)") +ELSE(NIGHTLY) SET(CPACK_NSIS_DISPLAY_NAME "vv - The 4D slicer") +ENDIF(NIGHTLY) SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/rio/vv") SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/rio") SET(CPACK_NSIS_CONTACT "vv@creatis.insa-lyon.fr") - SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\vv.lnk\\\" \\\"$INSTDIR\\\\vv.exe\\\" ") + SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\vv.lnk\\\" \\\"$INSTDIR\\\\bin\\\\vv.exe\\\" ") SET(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\vv.lnk\\\" ") #SET(CPACK_NSIS_MODIFY_PATH ON) SR: buggy, wait for cmake updates for a fix #SET(CPACK_BINARY_ZIP ON)