X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=dbb360c6085f2a235ad89444e2d8c022498da6af;hb=d4e9056274c04872a251d312704dcb02531792bf;hp=25cac3d36ebeac45f3a0835482c0596514b91fa0;hpb=8e0671d3fff58c9232517f0b91cc0d1d3d3821ed;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 25cac3d..dbb360c 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -12,16 +12,19 @@ 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 + vvToolStructureSetManager vvToolMIP vvToolConvert ## with dummy vvToolConvert.ui - + vvToolROIManager + vvToolSegmentation + ## these ones are for tests (not working) # vvToolFoo # vvToolFooWithWidgetBase @@ -31,7 +34,6 @@ SET(vv_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) @@ -62,7 +64,6 @@ SET(vv_COMMON_WITH_UI vvToolWidgetBase vvToolSimpleInputSelectorWidget vvToolInputSelectorWidget - vvToolStructureSetManager vvRegisterForm ) @@ -79,6 +80,7 @@ SET(vv_SRCS vvSlicer.cxx vvLandmarks.cxx vvLandmarksGlyph.cxx + vvClipPolyData.cxx vvGlyphSource.cxx vvGlyph2D.cxx vvSlicerManager.cxx @@ -89,15 +91,16 @@ SET(vv_SRCS vvMeshActor.cxx vvMeshReader.cxx vvMidPosition.cxx - vvImageMapToWLColors.cxx - vvThreadedFilter.cxx vvImageContour.cxx vvBinaryImageOverlayActor.cxx vvStructureSetActor.cxx + vvSaveState.cxx + vvReadState.cxx vvROIActor.cxx vvBlendImageActor.cxx vvToolManager.cxx vvToolCreatorBase.cxx + vvToolBaseBase.cxx ) #========================================================= @@ -111,16 +114,13 @@ QT4_WRAP_CPP(vv_SRCS vvHelpDialog.h vvQDicomSeriesSelector.h vvSlicerManager.h - vvThreadedFilter.h vvStructureSetActor.h vvROIActor.h vvToolCreatorBase.h - vvRegisterForm.h ) QT4_WRAP_UI(vv_UI_CXX qt_ui/vvHelpDialog.ui - qt_ui/vvRegisterForm.ui qt_ui/vvDocumentation.ui qt_ui/vvDicomSeriesSelector.ui qt_ui/vvDummyWindow.ui #For testing @@ -128,14 +128,25 @@ QT4_WRAP_UI(vv_UI_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) @@ -183,32 +194,50 @@ INCLUDE_DIRECTORIES( ../segmentation ) -IF(WIN32) - SET(EXE_ICON vvIcon.rc) -ENDIF(WIN32) - LINK_DIRECTORIES(${QT_LIBRARY_DIR}) -ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON}) -ADD_DEPENDENCIES(vv clitkSegmentationGgoLib) -TARGET_LINK_LIBRARIES(vv clitkDicomRTStruct) - #========================================================= #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) + +#========================================================= +# 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} ${vvCxImage}) +# 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) - SET_TARGET_PROPERTIES(vv - PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" ) +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 .) @@ -218,11 +247,11 @@ IF(UNIX AND NOT APPLE) # RENAME "lib${LIB}.so.${QT_VERSION_MAJOR}" # DESTINATION .) #ENDFOREACH(LIB) -ENDIF(UNIX AND NOT APPLE) +ENDIF(UNIX OR APPLE) IF(WIN32) #INCLUDE(InstallRequiredSystemLibraries) - INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/vv.exe DESTINATION .) + INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/vv.exe DESTINATION .) #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) ENDIF(WIN32) #========================================================= @@ -236,7 +265,7 @@ 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_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") SET(CPACK_STRIP_FILES TRUE) @@ -245,7 +274,7 @@ 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") SET(CPACK_NSIS_DISPLAY_NAME "vv - The 4D slicer") 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") @@ -261,8 +290,5 @@ ENDIF(WIN32) INCLUDE(CPack) #========================================================= #========================================================= -configure_file ( - vvCommon.h.in - vvCommon.h -) -#========================================================= \ No newline at end of file +configure_file(vvConfiguration.h.in vvConfiguration.h) +#=========================================================