X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=81fbf6012dd618aaa48dd787538ea80276c0d0f2;hb=f7e76f8ca9d06919dac0b0181d71eb615600b1d1;hp=266d4575c6cf387338712cd76f5979958b710736;hpb=4a567a442ac0d844a894e5de071d51a505d07f4a;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 266d457..81fbf60 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -1,92 +1,82 @@ cmake_minimum_required(VERSION 2.4) -#========================================================= -INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake) -#========================================================= -# Find ITK (required) -FIND_PACKAGE(ITK) -IF(ITK_FOUND) - INCLUDE(${ITK_USE_FILE}) -ELSE(ITK_FOUND) - MESSAGE(FATAL_ERROR - "Cannot build without ITK. Please set ITK_DIR.") -ENDIF(ITK_FOUND) -#========================================================= - -#========================================================= -# Find QT -FIND_PACKAGE(Qt4 REQUIRED) - -#========================================================= -INCLUDE_DIRECTORIES( - ${QT_INCLUDES} - ${VTK_INCLUDE_DIR} - ${QT_INCLUDE_DIR} - ${QT_QTGUI_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ../common - ../tools - ) #========================================================= # To avoid warning with some version if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) +#========================================================= -#SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) -#SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/../lib) #========================================================= -LINK_LIBRARIES ( - #ITKIO - clitkCommon - #clitkGGO - clitkFilters - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - vtkCommon - vtkRendering - vtkIO - vtkFiltering - vtkGraphics - vtkWidgets - vtkImaging - ) - -LINK_DIRECTORIES(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ) +#List of vv tools to compile +SET(vv_TOOLS + vvToolMedianFilter +# vvToolRigidReg ## Very long to compile + vvToolCropImage + vvToolBinarize + vvToolImageArithm + vvToolResample +# vvToolExtractPatient +# vvToolExtractLung + vvToolMIP + vvToolConvert ## with dummy vvToolConvert.ui + + ## these ones are for tests (not working) + # vvToolFoo + # vvToolFooWithWidgetBase + # vvToolPlastimatch + # vvToolConnectedComponentLabeling +) +# 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 -OPTION(CLITK_VV_USE_BDCM "Build vv with Dicom selector bdcm" OFF) +# 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 + vvToolStructureSetManager + vvRegisterForm +) +# All others sources SET(vv_SRCS - vvInfoPanel.cxx - vvLinkPanel.cxx - vvOverlayPanel.cxx - vvLandmarksPanel.cxx vvQProgressDialogITKCommand.cxx vvQDicomSeriesSelector.cxx - QVTKWidget.cxx QTreePushButton.cxx - vvResamplerDialog.cxx - vvSegmentationDialog.cxx - vvSurfaceViewerDialog.cxx - vvMainWindow.cxx - vvDeformationDialog.cxx - vvInit.cxx + vvMainWindowBase.cxx vvImageWarp.cxx - nkitkXDRImageIOFactory.cxx - nkitkXDRImageIOReader.cxx vvDeformableRegistration.cxx vtkVOXImageWriter.cxx vvInteractorStyleNavigator.cxx vvSlicer.cxx - vvImageReader.cxx - vvImageReader.txx - vvImageWriter.cxx - vvImageWriter.txx vvLandmarks.cxx vvLandmarksGlyph.cxx vvGlyphSource.cxx @@ -94,214 +84,197 @@ SET(vv_SRCS vvSlicerManager.cxx vvSlicerManagerCommand.cxx vvUtils.cxx - vvMaximumIntensityProjection.cxx +# vvMaximumIntensityProjection.cxx vvMesh.cxx vvMeshActor.cxx vvMeshReader.cxx - vvStructSelector.cxx - vvCropDialog.cxx vvMidPosition.cxx vvImageMapToWLColors.cxx - vvIntensityValueSlider.cxx + vvThreadedFilter.cxx + vvImageContour.cxx + vvBinaryImageOverlayActor.cxx + vvStructureSetActor.cxx + vvROIActor.cxx + vvBlendImageActor.cxx vvToolManager.cxx vvToolCreatorBase.cxx - vvToolBinarize.cxx - vvToolInputSelectorWidget.cxx - vvImageContour.cxx - ) +) + +#========================================================= +# Qt related commands +FIND_PACKAGE(Qt4 REQUIRED) QT4_WRAP_CPP(vv_SRCS - vvMainWindow.h - QVTKWidget.h + vvMainWindowBase.h QTreePushButton.h - vvInfoPanel.h - vvLinkPanel.h - vvOverlayPanel.h - vvLandmarksPanel.h vvDocumentation.h vvHelpDialog.h - vvProgressDialog.h vvQDicomSeriesSelector.h - vvResamplerDialog.h - vvSegmentationDialog.h - vvSurfaceViewerDialog.h - vvDeformationDialog.h vvSlicerManager.h - vvStructSelector.h - vvCropDialog.h - vvIntensityValueSlider.h + vvThreadedFilter.h + vvStructureSetActor.h + vvROIActor.h vvToolCreatorBase.h - vvToolBinarize.h - vvToolInputSelectorWidget.h + vvRegisterForm.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/vvRegisterForm.ui qt_ui/vvDocumentation.ui - qt_ui/vvProgressDialog.ui qt_ui/vvDicomSeriesSelector.ui - qt_ui/vvSegmentationDialog.ui - qt_ui/vvSurfaceViewerDialog.ui - qt_ui/vvResamplerDialog.ui - qt_ui/vvDeformationDialog.ui - qt_ui/vvStructSelector.ui - qt_ui/vvCropDialog.ui qt_ui/vvDummyWindow.ui #For testing - qt_ui/vvIntensityValueSlider.ui - qt_ui/vvToolBinarize.ui - qt_ui/vvToolInputSelectorWidget.ui ) -SET(vvUI_RCCS vvIcons.qrc) -QT4_ADD_RESOURCES(vv_SRCS ${vvUI_RCCS}) +QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc) + +# Add the autotools in the header vvToolsList.h for initialization of the dummy +# variables in vv.cxx for the tools contained in vvLib +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) + +# 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) + IF(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl) + FILE(READ ${QT_LIBRARY_DIR}/QtCore.prl QT_CORE_PRL) + IF(${QT_CORE_PRL} MATCHES "static") + SET(QT_STATIC 1) + ENDIF(${QT_CORE_PRL} MATCHES "static") + ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl) +ENDIF(WIN32) +IF(NOT QT_STATIC) + ADD_DEFINITIONS(-DQT_DLL) +ENDIF(NOT QT_STATIC) + +ADD_DEFINITIONS(-DQT_THREAD_SUPPORT) + +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${QT_INCLUDE_DIR} + ${QT_QTGUI_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) +#========================================================= #========================================================= #support for parallel deformable registration with OpenMP +IF(NOT APPLE) IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -march=native") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp") ENDIF(CMAKE_COMPILER_IS_GNUCC) +ENDIF(NOT APPLE) +#========================================================= #========================================================= +INCLUDE_DIRECTORIES( + ../common + ../tools + ../segmentation + ) -IF (CLITK_VV_USE_BDCM) - FIND_PACKAGE(bdcm) - IF(bdcm_FOUND) - INCLUDE(${bdcm_USE_FILE}) - ELSE(bdcm_FOUND) - MESSAGE(FATAL_ERROR - "Cannot build without BDCM. Please set BDCM_DIR.") - ENDIF(bdcm_FOUND) - #LINK_DIRECTORIES(/home/dsarrut/src/bdcm/build/) - #INCLUDE_DIRECTORIES(/home/dsarrut/src/bdcm/src2/) +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) - FIND_PACKAGE(GDCM) - IF(GDCM_FOUND) - INCLUDE(${GDCM_USE_FILE}) - ELSE(GDCM_FOUND) - MESSAGE(FATAL_ERROR - "Cannot build without GDCM. Please set GDCM_DIR.") - ENDIF(GDCM_FOUND) +#========================================================= +#Create binary and libs for tests +SET(vvExternalLibs clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries}) -ENDIF (CLITK_VV_USE_BDCM) +ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX}) +TARGET_LINK_LIBRARIES(vvLib ${vvExternalLibs}) IF(WIN32) - SET(EXE_ICON vvIcon.rc) + ADD_EXECUTABLE(vv WIN32 vv.cxx vvIcon.rc) +ELSE(WIN32) + ADD_EXECUTABLE(vv vv.cxx) ENDIF(WIN32) -ADD_DEFINITIONS(-DQT_DLL) +TARGET_LINK_LIBRARIES(vv vvLib) -ADD_DEFINITIONS(-DQT_THREAD_SUPPORT) - -ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON}) -TARGET_LINK_LIBRARIES(vv ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES} ) - -#test executable -#QT4_WRAP_CPP(VVS_MOC_OUTFILE vvs.h) -#QT4_WRAP_UI(VVS_UI_OUTFILE qt_ui/vvDummyWindow.ui) -#ADD_EXECUTABLE(vvs ${vv_SRCS} vvs.cxx ${vv_UI_CXX} ${VVS_UI_OUTFILE} -#${VVS_MOC_OUTFILE} ${EXE_ICON}) -#TARGET_LINK_LIBRARIES(vvs ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES} ) - -IF (CLITK_VV_USE_BDCM) - TARGET_LINK_LIBRARIES(vv ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES} bdcm) -ELSE (CLITK_VV_USE_BDCM) - #TARGET_LINK_LIBRARIES(vv ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES} ) -ENDIF (CLITK_VV_USE_BDCM) - -#IF( MINGW ) -# # resource compilation for MinGW -# ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vvIcons.o -# COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/vvIcons.qrc -o ${CMAKE_CURRENT_BINARY_DIR}/vvIcons.o ) -# SET(vv_SRCS ${vv_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/vvIcons.o) -#ENDIF (MINGW) - -#IF( MINGW ) -# ADD_EXECUTABLE(vv WIN32 ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON}) -#ELSE (MINGW) -# ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON}) -#ENDIF (MINGW) -#TARGET_LINK_LIBRARIES(vv ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES} QVTKWidgetPlugin ) #========================================================= -# Installation file -INSTALL(TARGETS vv vv - RUNTIME DESTINATION bin CONFIGURATIONS ${CMAKE_BUILD_TYPE} - LIBRARY DESTINATION lib CONFIGURATIONS ${CMAKE_BUILD_TYPE} - ARCHIVE DESTINATION lib CONFIGURATIONS ${CMAKE_BUILD_TYPE}) -INSTALL(FILES ${vv_HDRS} DESTINATION include) +# Install options (also used by CPack) +IF(UNIX AND NOT 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 AND NOT APPLE) IF(WIN32) - INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION bin) - INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/vv.exe DESTINATION bin) - INSTALL (FILES ${QT_PLUGINS_DIR}/../bin/QtCore4.dll DESTINATION bin) - INSTALL (FILES ${QT_PLUGINS_DIR}/../bin/QtGui4.dll DESTINATION bin) - INSTALL (FILES ${ITK_DIR}/bin/${CMAKE_BUILD_TYPE}/itkCommon.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkCommon.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtksys.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkRendering.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkGraphics.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkImaging.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkFiltering.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkGenericFiltering.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkIO.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkverdict.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/QVTK.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/QVTKWidgetPlugin.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkDICOMParser.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkexoIIc.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkexpat.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkmetaio.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkftgl.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkfreetype.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkGenericFiltering.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkHybrid.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkInfovis.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkjpeg.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtklibxml2.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkNetCDF.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkpng.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtktiff.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkViews.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkVolumeRendering.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkWidgets.dll DESTINATION bin) - INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkzlib.dll DESTINATION bin) + #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) - -IF(UNIX) - INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}/vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) - INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION bin) - INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}vv DESTINATION bin) -ENDIF(UNIX) +#========================================================= #========================================================= # CPack options -INCLUDE(InstallRequiredSystemLibraries) - +SET(CPACK_PACKAGE_NAME "vv") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "vv-src") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "vv, the 4D slicer : let's jump into a new dimension !") -SET(CPACK_PACKAGE_VENDOR "Creatis, CLB/RIO Team") +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 "0") -SET(CPACK_PACKAGE_VERSION_PATCH "0") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") -IF(WIN32 AND NOT UNIX) +SET(CPACK_PACKAGE_VERSION_MINOR "2") +SET(CPACK_PACKAGE_VERSION_PATCH "1") +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 # sure there is at least one set of four (4) backlasshes. - SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\ducky.png") - SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/${CMAKE_BUILD_TYPE}\\\\vv.exe") - SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} The 4D slicer") - SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/rio") + 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_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") - SET(CPACK_NSIS_MODIFY_PATH ON) -ELSE(WIN32 AND NOT UNIX) - SET(CPACK_STRIP_FILES "bin/vv") - SET(CPACK_SOURCE_STRIP_FILES "") -ENDIF(WIN32 AND NOT UNIX) -SET(CPACK_PACKAGE_EXECUTABLES "vv" "vv") + 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_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) +ELSE(WIN32) + SET(CPACK_GENERATOR "STGZ") + SET(CPACK_SOURCE_GENERATOR "TGZ") +ENDIF(WIN32) INCLUDE(CPack) +#========================================================= +#========================================================= +configure_file(vvConfiguration.h.in vvConfiguration.h) +#=========================================================