X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FCMakeLists.txt;h=a32e582c36e6de283165fb12348d69658fe28b94;hb=2b4229b2e82be6bd48817b0171afb2d69a9e9758;hp=fdfa09edfe4447ba359fd213d4344e5d324885f7;hpb=b68c2fa12e9122f37670d76de2592953d62beeed;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index fdfa09e..a32e582 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -21,6 +21,7 @@ SET(vv_SRCS
   vvSurfaceViewerDialog.cxx
   vvMainWindowBase.cxx
   vvMainWindow.cxx
+  vvProgressDialog.cxx
   vvDeformationDialog.cxx
   vvImageWarp.cxx
   vvDeformableRegistration.cxx
@@ -46,9 +47,11 @@ SET(vv_SRCS
   vvMidPosition.cxx
   vvImageMapToWLColors.cxx
   vvIntensityValueSlider.cxx
+  vvThreadedFilter.cxx
   vvToolManager.cxx
   vvToolCreatorBase.cxx
   vvToolWidgetBase.cxx
+#  vvToolWidgetWithStepsBase.cxx
   vvToolMedianFilter.cxx
   vvToolRigidReg.cxx
 #  vvToolFoo.cxx
@@ -66,6 +69,10 @@ SET(vv_SRCS
   vvROIActor.cxx
   vvToolResample.cxx
   vvBlendImageActor.cxx
+  vvLabelImageLoaderWidget.cxx
+  vvToolExtractLung.cxx
+  vvToolPlastimatch.cxx
+#  vvToolConnectedComponentLabeling.cxx
   )
 #=========================================================
 
@@ -91,6 +98,7 @@ QT4_WRAP_CPP(vv_SRCS
   vvSlicerManager.h
   vvStructSelector.h
   vvIntensityValueSlider.h
+  vvThreadedFilter.h
   vvToolCreatorBase.h
 #  vvToolFoo.h
 #  vvToolFooWithWidgetBase.h
@@ -100,6 +108,7 @@ QT4_WRAP_CPP(vv_SRCS
   vvToolSimpleInputSelectorWidget.h
   vvToolInputSelectorWidget.h
   vvToolWidgetBase.h
+#  vvToolWidgetWithStepsBase.h
   vvToolCropImage.h
   vvToolImageArithm.h
   vvToolConvert.h
@@ -107,6 +116,10 @@ QT4_WRAP_CPP(vv_SRCS
   vvStructureSetActor.h
   vvROIActor.h
   vvToolResample.h
+  vvLabelImageLoaderWidget.h
+  vvToolExtractLung.h
+  vvToolPlastimatch.h
+#  vvToolConnectedComponentLabeling.h
   )
 
 QT4_WRAP_UI(vv_UI_CXX 
@@ -125,9 +138,10 @@ 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/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,6 +150,10 @@ QT4_WRAP_UI(vv_UI_CXX
   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
   )
 
 QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
@@ -171,7 +189,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__)
 #=========================================================
@@ -180,6 +198,7 @@ ENDIF(NOT __APPLE__)
 INCLUDE_DIRECTORIES(
   ../common
   ../tools
+  ../segmentation
   )
 
 IF(WIN32)
@@ -188,11 +207,8 @@ ENDIF(WIN32)
 
 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)
+TARGET_LINK_LIBRARIES(vv clitkCommon clitkDicomRTStruct clitkFilters clitkSegmentationFilters ${ITK_LIBRARIES} QVTK vtkHybrid)
 
-IF (CLITK_VV_USE_BDCM)
-  TARGET_LINK_LIBRARIES(vv bdcm)
-ENDIF (CLITK_VV_USE_BDCM)
 #=========================================================
 
 #=========================================================
@@ -226,24 +242,25 @@ 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 "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 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_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\icons\\\\ducky.ico")
-  SET(CPACK_NSIS_INSTALLED_ICON_NAME "${EXECUTABLE_OUTPUT_PATH}\\\\${CMAKE_BUILD_TYPE}\\\\vv.exe")
-  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} The 4D slicer")
+  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_CONTACT "vv@creatis.insa-lyon.fr")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
-  SET(CPACK_BINARY_ZIP ON)
+  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)
 #=========================================================