Merge branch 'master' into PacsConnection

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 025a6f41d18ebbf7d2322019bc76f7d6237825f6..998678949445350b4841c8ab7d0d136f2f76b9d8 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -6,7 +6,7 @@ if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 #=========================================================
-
+OPTION(CLITK_USE_PACS_CONNECTION "USE PACS CONNECTION"       OFF)
 #=========================================================
 #List of vv tools to compile
 SET(vv_TOOLS
@@ -86,7 +86,8 @@ SET(vv_SRCS
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
   vvUtils.cxx
-  vvMesh.cxx
+#  vvMaximumIntensityProjection.cxx 
+ vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
   vvMidPosition.cxx
@@ -122,17 +123,26 @@ QT4_WRAP_UI(vv_UI_CXX
   qt_ui/vvHelpDialog.ui 
   qt_ui/vvDocumentation.ui 
   qt_ui/vvDicomSeriesSelector.ui
-  )
+qt_ui/vvDummyWindow.ui          #For testing 
+#qt_ui/vvPacsConnection.ui
+ #    qt_ui/vvPacsSettingsDialog.ui
+)
 
 QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 
-# Add DICOM gui selector if the adequate GDCM is available
-IF(CLITK_USE_SYSTEM_GDCM)
+# Add DICOM SERVER gui selector if the adequate GDCM is available
+IF(CLITK_USE_PACS_CONNECTION)
   SET(vv_SRCS ${vv_SRCS}
-      vvQPacsConnection.cxx)
-  QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.cxx)
-  QT4_WRAP_UI(vv_UI_CXX qt_ui/vvPacsConnection.ui)
-ENDIF(CLITK_USE_SYSTEM_GDCM)
+      vvQPacsConnection.cxx
+         vvPacsSettingsDialog.cxx
+         vvDicomServerQueryFactory.cxx
+         )
+  QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.h
+     vvPacsSettingsDialog.h)
+  QT4_WRAP_UI(vv_UI_CXX 
+       qt_ui/vvPacsConnection.ui
+     qt_ui/vvPacsSettingsDialog.ui)
+ENDIF(CLITK_USE_PACS_CONNECTION)
 
 # Add the autotools in the header vvToolsList.h for initialization of the dummy
 # variables in vv.cxx for the tools contained in vvLib