X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=6c7f8fe2205baa40097fbce84d68bfc77c355070;hb=53f34203827ffcfad26158aaf9c7f2f76822c050;hp=d704adc84b3eb60b5ce56024bb844b17ed3027c7;hpb=c7c62b61f99ae5c36563613b9a7b4b3b2ec3648b;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index d704adc..6c7f8fe 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -42,7 +42,7 @@ endif(COMMAND cmake_policy)
 LINK_LIBRARIES (
   #ITKIO
   clitkCommon
-  #clitkGGO
+  clitkDicomRTStruct
   clitkFilters
   ${QT_QTCORE_LIBRARY}
   ${QT_QTGUI_LIBRARY}
@@ -60,7 +60,7 @@ LINK_DIRECTORIES(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} )
 
 #=========================================================
 
-OPTION(CLITK_VV_USE_BDCM "Build vv with Dicom selector bdcm" OFF)
+# OPTION(CLITK_VV_USE_BDCM "Build vv with Dicom selector bdcm" OFF)
 
 SET(vv_SRCS
   vvInfoPanel.cxx
@@ -70,7 +70,6 @@ SET(vv_SRCS
   vvQProgressDialogITKCommand.cxx
   vvQDicomSeriesSelector.cxx
   QTreePushButton.cxx
-  vvResamplerDialog.cxx
   vvSegmentationDialog.cxx
   vvSurfaceViewerDialog.cxx
   vvMainWindowBase.cxx
@@ -97,19 +96,28 @@ SET(vv_SRCS
   vvMeshActor.cxx
   vvMeshReader.cxx
   vvStructSelector.cxx
-  vvCropDialog.cxx
   vvMidPosition.cxx
   vvImageMapToWLColors.cxx
   vvIntensityValueSlider.cxx
   vvToolManager.cxx
   vvToolCreatorBase.cxx
   vvToolWidgetBase.cxx
-  vvToolFoo.cxx
-  vvToolFooWithWidgetBase.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
   )
 
 QT4_WRAP_CPP(vv_SRCS 
@@ -124,21 +132,28 @@ QT4_WRAP_CPP(vv_SRCS
   vvHelpDialog.h  
   vvProgressDialog.h 
   vvQDicomSeriesSelector.h 
-  vvResamplerDialog.h
   vvSegmentationDialog.h
   vvSurfaceViewerDialog.h
   vvDeformationDialog.h
   vvSlicerManager.h
   vvStructSelector.h
-  vvCropDialog.h
   vvIntensityValueSlider.h
   vvToolCreatorBase.h
-  vvToolFoo.h
-  vvToolFooWithWidgetBase.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
+  vvStructureSetActor.h
+  vvROIActor.h
+  vvToolResample.h
   )
 
 QT4_WRAP_UI(vv_UI_CXX 
@@ -153,17 +168,21 @@ 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/vvToolSimpleInputSelectorWidget.ui
+  qt_ui/vvToolInputSelectorWidget.ui
   qt_ui/vvToolWidgetBase.ui
-  qt_ui/vvToolFoo.ui
+  qt_ui/vvToolMedianFilter.ui
+  qt_ui/vvToolRigidReg.ui
+#  qt_ui/vvToolFoo.ui
   qt_ui/vvToolCropImage.ui
   qt_ui/vvToolBinarize.ui
-  qt_ui/vvToolInputSelectorWidget.ui
+  qt_ui/vvToolImageArithm.ui
+  qt_ui/vvToolStructureSetManager.ui
+  qt_ui/vvToolResample.ui
   )
 
 SET(vvUI_RCCS vvIcons.qrc)
@@ -171,32 +190,33 @@ QT4_ADD_RESOURCES(vv_SRCS ${vvUI_RCCS})
 
 #=========================================================
 #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")
 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/)
+# 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)
+#   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)
+# ENDIF (CLITK_VV_USE_BDCM)
 
 IF(WIN32)
   SET(EXE_ICON vvIcon.rc)