endif(COMMAND cmake_policy)
#=========================================================
+#List of vv tools to compile
+SET(vv_TOOLS
+ vvToolWidgetBase
+# vvToolWidgetWithStepsBase
+ vvToolMedianFilter
+# vvToolRigidReg
+# vvToolFoo
+# vvToolFooWithWidgetBase
+# vvToolCropImage
+ vvToolBinarize
+ vvToolSimpleInputSelectorWidget
+ vvToolInputSelectorWidget
+ vvToolImageArithm
+ vvToolStructureSetManager
+ vvToolResample
+ vvToolExtractPatient
+ vvToolExtractLung
+# vvToolPlastimatch
+# vvToolConnectedComponentLabeling
+)
+#dependencies of the tools
+SET(vvToolRigidReg_LIBS clitkAffineRegistrationLib)
+
#=========================================================
# List of vv source files
SET(vv_SRCS
vvSurfaceViewerDialog.cxx
vvMainWindowBase.cxx
vvMainWindow.cxx
+ vvProgressDialog.cxx
vvDeformationDialog.cxx
vvImageWarp.cxx
vvDeformableRegistration.cxx
vvMidPosition.cxx
vvImageMapToWLColors.cxx
vvIntensityValueSlider.cxx
- vvToolManager.cxx
- vvToolCreatorBase.cxx
- vvToolWidgetBase.cxx
- vvToolMedianFilter.cxx
- vvToolRigidReg.cxx
-# vvToolFoo.cxx
-# vvToolFooWithWidgetBase.cxx
- vvToolCropImage.cxx
- vvToolBinarize.cxx
- vvToolSimpleInputSelectorWidget.cxx
- vvToolInputSelectorWidget.cxx
+ vvThreadedFilter.cxx
vvImageContour.cxx
vvBinaryImageOverlayActor.cxx
- vvToolImageArithm.cxx
- vvToolConvert.cxx
- vvToolStructureSetManager.cxx
vvStructureSetActor.cxx
vvROIActor.cxx
- vvToolResample.cxx
vvBlendImageActor.cxx
- )
+ vvLabelImageLoaderWidget.cxx
+ vvToolManager.cxx
+ vvToolCreatorBase.cxx
+ vvToolConvert.cxx
+)
+
#=========================================================
#=========================================================
vvSlicerManager.h
vvStructSelector.h
vvIntensityValueSlider.h
- vvToolCreatorBase.h
-# vvToolFoo.h
-# vvToolFooWithWidgetBase.h
- vvToolMedianFilter.h
- vvToolRigidReg.h
- vvToolBinarize.h
- vvToolSimpleInputSelectorWidget.h
- vvToolInputSelectorWidget.h
- vvToolWidgetBase.h
- vvToolCropImage.h
- vvToolImageArithm.h
- vvToolConvert.h
- vvToolStructureSetManager.h
+ vvThreadedFilter.h
vvStructureSetActor.h
vvROIActor.h
- vvToolResample.h
+ vvLabelImageLoaderWidget.h
+ vvToolCreatorBase.h
+ vvToolConvert.h
)
QT4_WRAP_UI(vv_UI_CXX
qt_ui/vvStructSelector.ui
qt_ui/vvDummyWindow.ui #For testing
qt_ui/vvIntensityValueSlider.ui
- qt_ui/vvToolSimpleInputSelectorWidget.ui
- qt_ui/vvToolInputSelectorWidget.ui
- qt_ui/vvToolWidgetBase.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
)
QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
-ADD_DEFINITIONS(-DQT_DLL)
+#Add the autotools
+foreach(tool ${vv_TOOLS})
+ 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)
+
+# 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(
#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(WIN32)
SET(EXE_ICON vvIcon.rc)
ENDIF(WIN32)
-IF(UNIX)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-ENDIF(UNIX)
-
LINK_DIRECTORIES(${QT_INCLUDES})
ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON})
-TARGET_LINK_LIBRARIES(vv clitkCommon clitkDicomRTStruct clitkFilters ${ITK_LIBRARIES} QVTK vtkHybrid)
+ADD_DEPENDENCIES(vv clitkToolsGgoLib clitkSegmentationGgoLib)
+TARGET_LINK_LIBRARIES(vv clitkDicomRTStruct
+#Libs for generic filters with long compilation times
+clitkImageConvertLib
+clitkImageResampleLib
+clitkBinarizeImageLib
+#Libs for _ggo.c files
+clitkSegmentationGgoLib clitkToolsGgoLib
+clitkRegistrationGgoLib
+)
+
+#=========================================================
+#Add each tool's dependencies
+foreach(tool ${vv_TOOLS})
+ target_link_libraries(vv ${${tool}_LIBS})
+endforeach(tool)
-IF (CLITK_VV_USE_BDCM)
- TARGET_LINK_LIBRARIES(vv bdcm)
-ENDIF (CLITK_VV_USE_BDCM)
#=========================================================
+#Add Foundation Libraries (this should be after our libraries, since we depend
+#on them)
+TARGET_LINK_LIBRARIES(vv
+clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
#=========================================================
# Install options (also used by CPack)
ENDIF(UNIX AND NOT APPLE)
IF(WIN32)
- INCLUDE(InstallRequiredSystemLibraries)
- 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)
+ #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)
+#=========================================================
#=========================================================
# CPack options
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt")
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
IF(WIN32)
- 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")
+ # 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_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)
+ 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_STRIP_FILES "bin/vv")
SET(CPACK_GENERATOR "STGZ")
SET(CPACK_SOURCE_GENERATOR "TGZ")
ENDIF(WIN32)
-SET(CPACK_PACKAGE_EXECUTABLES "vv" "vv")
INCLUDE(CPack)
-
+#=========================================================
git://git.creatis.insa-lyon.fr / clitk.git / blobdiff