X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=9c991ff787e131e7fa64ba1a3dc211e7acc3eb16;hb=da2e843f73cad8d9116fce78361076c2e59a8941;hp=86f057e2854e48eed776ec0057581ade1cb7d03c;hpb=355af9d476ce187bd11cd851b823a49a1b3face7;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 86f057e..9c991ff 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -7,7 +7,6 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 #=========================================================
 
-
 #=========================================================
 #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,25 @@ 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_SYSTEM_GDCM)
+  SET(vv_SRCS ${vv_SRCS}
+      vvQPacsConnection.cxx
+	  vvPacsSettingsDialog.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_SYSTEM_GDCM)
+
 # 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 +154,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
@@ -188,15 +200,6 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(NOT APPLE)
 #=========================================================
 
-
-#=========================================================
-# for ITK4 + external GDCM (RT Struct)
-IF (CLITK_USE_SYSTEM_GDCM)
-  FIND_PACKAGE(GDCM REQUIRED)
-  INCLUDE(${GDCM_USE_FILE})
-ENDIF()
-
-
 #=========================================================
 INCLUDE_DIRECTORIES(
   ../common
@@ -241,10 +244,8 @@ ELSE(WIN32)
   ADD_EXECUTABLE(vv vv.cxx)
 ENDIF(WIN32)
 
-#TARGET_LINK_LIBRARIES(vv vvLib)
 TARGET_LINK_LIBRARIES(vv vvLib)
 
-
 #=========================================================
 # Install options (also used by CPack)
 INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)