Merge branch 'PacsConnection' of ssh://git.creatis.insa-lyon.fr/clitk into PacsConnection

[clitk.git] / common / CMakeLists.txt

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 0ff0321c826892220dfd872297978efe7719b260..6c1096a6ca384017eb03c936da33969de416d4e3 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -62,19 +62,15 @@ IF(CLITK_MEMORY_INFO)
 ENDIF(CLITK_MEMORY_INFO)
 
 
-### Set add libraries if system GDCM 
-DD(CLITK_USE_SYSTEM_GDCM)
+#=========================================================
 IF (CLITK_USE_SYSTEM_GDCM)
   FIND_PACKAGE(GDCM REQUIRED)
-  DD(GDCM_USE_FILE)
-  DD(GDCM_INCLUDE_DIRS)
-  DD(GDCM_LIBRARY_DIRS)
-  #SET(CLITK_GDCM_LIBRARIES gdcmDSED) 
-  SET(CLITK_GDCM_LIBRARIES gdcmDICT gdcmMSFF vtkgdcm)
-  DD(CLITK_GDCM_LIBRARIES)
+  include(${GDCM_USE_FILE})
+  TARGET_LINK_LIBRARIES(clitkCommon vtkgdcm gdcmDICT gdcmMSFF gdcmMEXD)
 ENDIF()
+#=========================================================
 
-TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
+TARGET_LINK_LIBRARIES(clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES})
 
 ADD_LIBRARY(clitkDicomRTStruct STATIC
   clitkDicomRT_Contour.cxx
@@ -83,7 +79,7 @@ ADD_LIBRARY(clitkDicomRTStruct STATIC
   clitkDicomRTStruct2ImageFilter.cxx
   )
 
-TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES})
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct clitkCommon)
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)