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 672023e08e723cd8b38abe99d2b4cd1639257bc1..6c1096a6ca384017eb03c936da33969de416d4e3 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -61,59 +61,25 @@ 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)
-
-TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
 
+#=========================================================
 IF (CLITK_USE_SYSTEM_GDCM)
-  DD(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_LIBRARY_DIRS)
-  DD(GDCM_LIBRARIES)
-
-  ADD_LIBRARY(clitkDicomRTStruct STATIC
-    clitkDicomRT_Contour.cxx
-    clitkDicomRT_ROI.cxx
-    clitkDicomRT_StructureSet.cxx
-    clitkDicomRTStruct2ImageFilter.cxx
-    vtkGDCMPolyDataReader.cxx
-    vtkGDCMPolyDataWriter.cxx
-    )
-  TARGET_LINK_LIBRARIES(clitkDicomRTStruct ${ITK_LIBRARIES} ${GDCM_LIBRARIES})
-
-ELSE()
-  ADD_LIBRARY(clitkDicomRTStruct STATIC
-    clitkDicomRT_Contour.cxx
-    clitkDicomRT_ROI.cxx
-    clitkDicomRT_StructureSet.cxx
-    clitkDicomRTStruct2ImageFilter.cxx
-    )
+  include(${GDCM_USE_FILE})
+  TARGET_LINK_LIBRARIES(clitkCommon vtkgdcm gdcmDICT gdcmMSFF gdcmMEXD)
 ENDIF()
+#=========================================================
+
+TARGET_LINK_LIBRARIES(clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES})
 
+ADD_LIBRARY(clitkDicomRTStruct STATIC
+  clitkDicomRT_Contour.cxx
+  clitkDicomRT_ROI.cxx
+  clitkDicomRT_StructureSet.cxx
+  clitkDicomRTStruct2ImageFilter.cxx
+  )
 
-TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES} ${GDCM_LIBRARIES} ) 
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct clitkCommon)
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)