X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=998678949445350b4841c8ab7d0d136f2f76b9d8;hb=4eb6f95e59a7602564b15f9d0715650dc91442a2;hp=ccfe267078ef37e5d43e3f994fbd6c715dd86b70;hpb=f92a09d3aa2152207e858350faaa6edafcb05002;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index ccfe267..9986789 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -6,8 +6,7 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) #========================================================= - - +OPTION(CLITK_USE_PACS_CONNECTION "USE PACS CONNECTION" OFF) #========================================================= #List of vv tools to compile SET(vv_TOOLS @@ -17,17 +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 ? @@ -41,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 @@ -78,18 +80,17 @@ SET(vv_SRCS vvSlicer.cxx vvLandmarks.cxx vvLandmarksGlyph.cxx + vvClipPolyData.cxx vvGlyphSource.cxx vvGlyph2D.cxx 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 @@ -99,6 +100,7 @@ SET(vv_SRCS vvBlendImageActor.cxx vvToolManager.cxx vvToolCreatorBase.cxx + vvToolBaseBase.cxx ) #========================================================= @@ -112,7 +114,6 @@ QT4_WRAP_CPP(vv_SRCS vvHelpDialog.h vvQDicomSeriesSelector.h vvSlicerManager.h - vvThreadedFilter.h vvStructureSetActor.h vvROIActor.h vvToolCreatorBase.h @@ -121,12 +122,28 @@ 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 +#qt_ui/vvPacsConnection.ui + # qt_ui/vvPacsSettingsDialog.ui +) QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc) +# Add DICOM SERVER gui selector if the adequate GDCM is available +IF(CLITK_USE_PACS_CONNECTION) + SET(vv_SRCS ${vv_SRCS} + vvQPacsConnection.cxx + vvPacsSettingsDialog.cxx + vvDicomServerQueryFactory.cxx + ) + QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.h + vvPacsSettingsDialog.h) + QT4_WRAP_UI(vv_UI_CXX + qt_ui/vvPacsConnection.ui + qt_ui/vvPacsSettingsDialog.ui) +ENDIF(CLITK_USE_PACS_CONNECTION) + # 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) @@ -140,15 +157,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 @@ -194,19 +211,31 @@ 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) SET(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid) +#========================================================= +# Use CxImage to create animated gifs +IF(CLITK_EXPERIMENTAL) + SET(vvCxImage clitkCxImage) + SET(vv_SRCS ${vv_SRCS} vvAnimatedGIFWriter.cxx) + INCLUDE_DIRECTORIES(${CLITK_SOURCE_DIR}/utilities/CxImage) + ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/utilities/CxImage ${PROJECT_BINARY_DIR}/utilities/CxImage) +ENDIF(CLITK_EXPERIMENTAL) +#========================================================= + #========================================================= #Create binary and libs for tests -SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries}) +SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage}) # QtNetwork is required by vvRegisterForm ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX}) @@ -218,31 +247,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 .) +INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) - #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) - -IF(WIN32) - #INCLUDE(InstallRequiredSystemLibraries) - INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/vv.exe DESTINATION .) - #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) -ENDIF(WIN32) #========================================================= #========================================================= @@ -254,21 +264,29 @@ 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 "2") -SET(CPACK_PACKAGE_VERSION_PATCH "2") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") +SET(CPACK_PACKAGE_VERSION_MINOR "3") +SET(CPACK_PACKAGE_VERSION_PATCH "0") +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) # There is a bug in NSI that does not handle full unix paths properly. Make # 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 "${CMAKE_BUILD_TYPE}\\\\vv.exe") + 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)