Merge branch 'master' into PacsConnection

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 19511db659764f71797884a3cf25488169b21a09..998678949445350b4841c8ab7d0d136f2f76b9d8 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -6,8 +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
@@ -87,8 +86,8 @@ SET(vv_SRCS
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
   vvUtils.cxx
-#  vvMaximumIntensityProjection.cxx
-  vvMesh.cxx
+#  vvMaximumIntensityProjection.cxx 
+ vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
   vvMidPosition.cxx
@@ -123,12 +122,28 @@ QT4_WRAP_CPP(vv_SRCS
 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/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 SERVER gui selector if the adequate GDCM is available
+IF(CLITK_USE_PACS_CONNECTION)
+  SET(vv_SRCS ${vv_SRCS}
+      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
 if(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
@@ -142,15 +157,15 @@ endif(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_B
 
 # Add the autotools and the common files ui
 foreach(tool ${vv_TOOLS} ${vv_COMMON_WITH_UI})
-    SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
-    QT4_WRAP_CPP(vv_SRCS ${tool}.h)
-    QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
+  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)
 
 # Add the common source files
 foreach(tool ${vv_COMMON})
-    SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
-    QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+  SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
+  QT4_WRAP_CPP(vv_SRCS ${tool}.h)
 endforeach(tool)
 
 # if Windows and Qt was built as a static lib then don't set QT_DLL flag
@@ -232,7 +247,7 @@ ELSE(WIN32)
   ADD_EXECUTABLE(vv vv.cxx)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(vv vvLib  ${CLITK_GDCM_LIBRARIES})
+TARGET_LINK_LIBRARIES(vv vvLib)
 
 #=========================================================
 # Install options (also used by CPack)