add seg folder

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index c9fe3daab0a9cdb3ed12d896f6ddd37eaafae8ab..ae9d80a2b1a86faacdd93c3945f1b2cfdfb17fbc 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -49,6 +49,7 @@ SET(vv_SRCS
   vvToolManager.cxx
   vvToolCreatorBase.cxx
   vvToolWidgetBase.cxx
+#  vvToolWidgetWithStepsBase.cxx
   vvToolMedianFilter.cxx
   vvToolRigidReg.cxx
 #  vvToolFoo.cxx
@@ -66,6 +67,8 @@ SET(vv_SRCS
   vvROIActor.cxx
   vvToolResample.cxx
   vvBlendImageActor.cxx
+#  vvToolExtractLung.cxx
+#  vvToolConnectedComponentLabeling.cxx
   )
 #=========================================================
 
@@ -100,6 +103,7 @@ QT4_WRAP_CPP(vv_SRCS
   vvToolSimpleInputSelectorWidget.h
   vvToolInputSelectorWidget.h
   vvToolWidgetBase.h
+#  vvToolWidgetWithStepsBase.h
   vvToolCropImage.h
   vvToolImageArithm.h
   vvToolConvert.h
@@ -107,6 +111,8 @@ QT4_WRAP_CPP(vv_SRCS
   vvStructureSetActor.h
   vvROIActor.h
   vvToolResample.h
+#  vvToolExtractLung.h
+#  vvToolConnectedComponentLabeling.h
   )
 
 QT4_WRAP_UI(vv_UI_CXX 
@@ -128,6 +134,7 @@ QT4_WRAP_UI(vv_UI_CXX
   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
@@ -136,11 +143,27 @@ QT4_WRAP_UI(vv_UI_CXX
   qt_ui/vvToolImageArithm.ui
   qt_ui/vvToolStructureSetManager.ui
   qt_ui/vvToolResample.ui
+#  qt_ui/vvToolExtractLung.ui
+#  qt_ui/vvToolConnectedComponentLabeling.ui
   )
 
 QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 
-ADD_DEFINITIONS(-DQT_DLL)
+
+# 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(
@@ -157,7 +180,7 @@ 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__)
 #=========================================================
@@ -166,23 +189,17 @@ 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)
 
-IF (CLITK_VV_USE_BDCM)
-  TARGET_LINK_LIBRARIES(vv bdcm)
-ENDIF (CLITK_VV_USE_BDCM)
 #=========================================================
 
 #=========================================================
@@ -200,16 +217,16 @@ IF(UNIX AND NOT APPLE)
 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_PACKAGE_NAME vv)
+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")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
@@ -218,17 +235,23 @@ 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_SOURCE_STRIP_FILES "")
+  SET(CPACK_GENERATOR "STGZ")
+  SET(CPACK_SOURCE_GENERATOR "TGZ") 
 ENDIF(WIN32)
-SET(CPACK_PACKAGE_EXECUTABLES "vv" "vv")
 INCLUDE(CPack)
-
+#=========================================================