X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FCMakeLists.txt;h=672023e08e723cd8b38abe99d2b4cd1639257bc1;hb=4951184c1f1b9f31b2df0bc5b15dd4ab1c39990b;hp=a85fda611b1054e0dcfe74ece18ce22c4fd13ebd;hpb=138d9b4ae5336543a9afc3b391b30f8398be3421;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index a85fda6..672023e 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -15,13 +15,23 @@ SET(clitkCommon_SRC
   clitkVoxImageIOFactory.cxx
   clitkVfImageIO.cxx  
   clitkVfImageIOFactory.cxx
-  clitkHisImageIO.cxx  
-  clitkHisImageIOFactory.cxx
   clitkXdrImageIOReader.cxx  
   clitkXdrImageIOWriter.cxx  
   clitkXdrImageIOFactory.cxx
+  rtkHisImageIO.cxx  
+  rtkHisImageIOFactory.cxx
   rtkHndImageIO.cxx
   rtkHndImageIOFactory.cxx
+  rtkEdfImageIO.cxx
+  rtkEdfImageIOFactory.cxx
+  rtkXRadImageIO.cxx
+  rtkXRadImageIOFactory.cxx
+  rtkImagXImageIO.cxx
+  rtkImagXImageIOFactory.cxx
+  rtkImagXXMLFileReader.cxx
+  clitkEsrfHstImageIO.cxx  
+  clitkEsrfHstImageIOFactory.cxx
+  clitkEsrfHstXMLFileReader.cxx
   clitkDicomRTDoseIO.cxx
   clitkDicomRTDoseIOFactory.cxx
   clitkOrientation.cxx
@@ -47,9 +57,9 @@ ENDIF(CLITK_PRIVATE_FEATURES)
 ### Declare clitkCommon library
 ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC})
 
-IF(NOT ${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+IF(CLITK_MEMORY_INFO)
   TARGET_LINK_LIBRARIES(clitkCommon statgrab)
-ENDIF(NOT ${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+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)
@@ -58,10 +68,11 @@ IF(ITK_VERSION_MAJOR LESS "4")
     SET(CLITK_USE_SYSTEM_GDCM TRUE) 
   ENDIF(ITK_USE_SYSTEM_GDCM)
 ELSE(ITK_VERSION_MAJOR LESS "4")
-  SET(GDCM_INCLUDE ".*include/gdcm-.*")
-  IF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
+  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})
+  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)
@@ -70,14 +81,39 @@ ENDIF(CLITK_USE_SYSTEM_GDCM)
 
 TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
 
-ADD_LIBRARY(clitkDicomRTStruct STATIC
-  clitkDicomRT_Contour.cxx
-  clitkDicomRT_ROI.cxx
-  clitkDicomRT_StructureSet.cxx
-  clitkDicomRTStruct2ImageFilter.cxx
-)
+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
+    )
+ENDIF()
+
 
-TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES}) 
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES} ${GDCM_LIBRARIES} ) 
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)