X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=common%2FCMakeLists.txt;h=0ff0321c826892220dfd872297978efe7719b260;hb=d679103224c795e1e99cc3c33dd1c07fe94151f6;hp=99e01a7fc33ad9ed7797d2651b0634653f8db357;hpb=7eb8ed48509d44c5685ecd3e23231762c815dacc;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 99e01a7..0ff0321 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -61,23 +61,18 @@ IF(CLITK_MEMORY_INFO)
   TARGET_LINK_LIBRARIES(clitkCommon statgrab)
 ENDIF(CLITK_MEMORY_INFO)
 
-### Check if ITK was compiled with SYSTEM_GDCM = ON and set the gdcm libraries accordingly
-SET(CLITK_USE_SYSTEM_GDCM FALSE)
-IF(ITK_VERSION_MAJOR LESS "4")
-  IF(ITK_USE_SYSTEM_GDCM)
-    SET(CLITK_USE_SYSTEM_GDCM TRUE) 
-  ENDIF(ITK_USE_SYSTEM_GDCM)
-ELSE(ITK_VERSION_MAJOR LESS "4")
-  SET(GDCM_INCLUDE_INSTALL ".*include/gdcm-.*")
-  SET(GDCM_INCLUDE_BUILD ".*/Source/MediaStorageAndFileFormat")
-  IF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_BUILD} OR ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_INSTALL})
-    SET(CLITK_USE_SYSTEM_GDCM TRUE)
-  ENDIF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_BUILD} OR ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_INSTALL})
-ENDIF(ITK_VERSION_MAJOR LESS "4")
 
-IF(CLITK_USE_SYSTEM_GDCM)
-  SET(CLITK_GDCM_LIBRARIES gdcmDSED) 
-ENDIF(CLITK_USE_SYSTEM_GDCM)
+### 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)
+ENDIF()
 
 TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
 
@@ -88,20 +83,7 @@ ADD_LIBRARY(clitkDicomRTStruct STATIC
   clitkDicomRTStruct2ImageFilter.cxx
   )
 
-IF (CLITK_USE_SYSTEM_GDCM)
-  FIND_PACKAGE(GDCM REQUIRED)
-  INCLUDE(${GDCM_USE_FILE})
-  FIND_LIBRARY(LIBVTKGDCM vtkgdcm ${GDCM_LIBRARY_DIRS})
-  SET(GDCM_LIBRARIES ${LIBVTKGDCM})
-  # DD(GDCM_USE_FILE)
-  # DD(GDCM_INCLUDE_DIRS)
-  # DD(GDCM_LIBRARY_DIRS)
-  # DD(GDCM_LIBRARIES)
-  #TARGET_LINK_LIBRARIES(clitkDicomRTStruct ${ITK_LIBRARIES} ${GDCM_LIBRARIES})
-ENDIF()
-
-
-TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES} ${GDCM_LIBRARIES}) 
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES})
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)