cmake_minimum_required(VERSION 2.4)
-#=========================================================
-INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake)
-#=========================================================
-
-#Set a reasonable build mode default if the user hasn't set any
-if (NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
-endif (NOT CMAKE_BUILD_TYPE)
-
-#=========================================================
-# 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} )
#=========================================================
-
-OPTION(CLITK_VV_USE_BDCM "Build vv with Dicom selector bdcm" OFF)
-
+# List of vv source files
SET(vv_SRCS
vvInfoPanel.cxx
vvLinkPanel.cxx
vvLandmarksPanel.cxx
vvQProgressDialogITKCommand.cxx
vvQDicomSeriesSelector.cxx
- QVTKWidget.cxx
QTreePushButton.cxx
- vvResamplerDialog.cxx
vvSegmentationDialog.cxx
vvSurfaceViewerDialog.cxx
+ vvMainWindowBase.cxx
vvMainWindow.cxx
+ vvProgressDialog.cxx
vvDeformationDialog.cxx
- vvInit.cxx
vvImageWarp.cxx
- nkitkXDRImageIOFactory.cxx
- nkitkXDRImageIOReader.cxx
vvDeformableRegistration.cxx
vtkVOXImageWriter.cxx
vvInteractorStyleNavigator.cxx
vvMeshActor.cxx
vvMeshReader.cxx
vvStructSelector.cxx
- vvCropDialog.cxx
vvMidPosition.cxx
vvImageMapToWLColors.cxx
vvIntensityValueSlider.cxx
+ vvThreadedFilter.cxx
vvToolManager.cxx
vvToolCreatorBase.cxx
+ vvToolWidgetBase.cxx
+# vvToolWidgetWithStepsBase.cxx
+ vvToolMedianFilter.cxx
+ vvToolRigidReg.cxx
+# vvToolFoo.cxx
+# vvToolFooWithWidgetBase.cxx
+ vvToolCropImage.cxx
vvToolBinarize.cxx
+ vvToolSimpleInputSelectorWidget.cxx
vvToolInputSelectorWidget.cxx
+ vvImageContour.cxx
+ vvBinaryImageOverlayActor.cxx
+ vvToolImageArithm.cxx
+ vvToolConvert.cxx
+ vvToolStructureSetManager.cxx
+ vvStructureSetActor.cxx
+ vvROIActor.cxx
+ vvToolResample.cxx
+ vvBlendImageActor.cxx
+ vvLabelImageLoaderWidget.cxx
+ vvToolExtractLung.cxx
+ vvToolPlastimatch.cxx
+# vvToolConnectedComponentLabeling.cxx
)
+#=========================================================
+
+#=========================================================
+# Qt related commands
+FIND_PACKAGE(Qt4 REQUIRED)
QT4_WRAP_CPP(vv_SRCS
+ vvMainWindowBase.h
vvMainWindow.h
- QVTKWidget.h
QTreePushButton.h
vvInfoPanel.h
vvLinkPanel.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
vvToolCreatorBase.h
+# vvToolFoo.h
+# vvToolFooWithWidgetBase.h
+ vvToolMedianFilter.h
+ vvToolRigidReg.h
vvToolBinarize.h
+ vvToolSimpleInputSelectorWidget.h
vvToolInputSelectorWidget.h
+ vvToolWidgetBase.h
+# vvToolWidgetWithStepsBase.h
+ vvToolCropImage.h
+ vvToolImageArithm.h
+ vvToolConvert.h
+ vvToolStructureSetManager.h
+ vvStructureSetActor.h
+ vvROIActor.h
+ vvToolResample.h
+ vvLabelImageLoaderWidget.h
+ vvToolExtractLung.h
+ vvToolPlastimatch.h
+# vvToolConnectedComponentLabeling.h
)
QT4_WRAP_UI(vv_UI_CXX
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/vvToolSimpleInputSelectorWidget.ui
qt_ui/vvToolInputSelectorWidget.ui
+ qt_ui/vvToolWidgetBase.ui
+# qt_ui/vvToolWidgetWithStepsBase.ui
+ qt_ui/vvToolMedianFilter.ui
+ qt_ui/vvToolRigidReg.ui
+# qt_ui/vvToolFoo.ui
+ qt_ui/vvToolCropImage.ui
+ qt_ui/vvToolBinarize.ui
+ qt_ui/vvToolImageArithm.ui
+ qt_ui/vvToolStructureSetManager.ui
+ qt_ui/vvToolResample.ui
+ qt_ui/vvLabelImageLoaderWidget.ui
+ qt_ui/vvToolExtractLung.ui
+ qt_ui/vvToolPlastimatch.ui
+# qt_ui/vvToolConnectedComponentLabeling.ui
)
-SET(vvUI_RCCS vvIcons.qrc)
-QT4_ADD_RESOURCES(vv_SRCS ${vvUI_RCCS})
+QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
+
+
+# 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__)
#=========================================================
-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/)
-
- 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)
-
-ENDIF (CLITK_VV_USE_BDCM)
+#=========================================================
+INCLUDE_DIRECTORIES(
+ ../common
+ ../tools
+ ../segmentation
+ )
IF(WIN32)
SET(EXE_ICON vvIcon.rc)
ENDIF(WIN32)
-ADD_DEFINITIONS(-DQT_DLL)
-
-ADD_DEFINITIONS(-DQT_THREAD_SUPPORT)
-
+LINK_DIRECTORIES(${QT_INCLUDES})
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)
+TARGET_LINK_LIBRARIES(vv clitkCommon clitkDicomRTStruct clitkFilters clitkSegmentationFilters ${ITK_LIBRARIES} QVTK vtkHybrid)
-#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 relwithdebinfo
- LIBRARY DESTINATION lib CONFIGURATIONS relwithdebinfo
- ARCHIVE DESTINATION lib CONFIGURATIONS relwithdebinfo)
-INSTALL(FILES ${vv_HDRS} DESTINATION include)
+# 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 .)
+
+ #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}/ducky.png DESTINATION bin)
- INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}relwithdebinfo/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 ${VTK_DIR}/bin/relwithdebinfo/vtkCommon.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtksys.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkRendering.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGraphics.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkImaging.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkFiltering.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGenericFiltering.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkIO.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/verdict.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTK.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTKWidgetPlugin.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkDICOMParser.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkexoIIc.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkexpat.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkmetaio.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkftgl.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkfreetype.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGenericFiltering.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkHybrid.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkInfovis.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkjpeg.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtklibxml2.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkNetCDF.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkpng.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtktiff.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkViews.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkVolumeRendering.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkWidgets.dll DESTINATION bin)
- INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/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_MINOR "1")
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_INSTALL_DIRECTORY "vv")
+
+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/relwithdebinfo\\\\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)
+#=========================================================
git://git.creatis.insa-lyon.fr / clitk.git / blobdiff