X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=672023e08e723cd8b38abe99d2b4cd1639257bc1;hb=4951184c1f1b9f31b2df0bc5b15dd4ab1c39990b;hp=4dcf32530b2d6ab661d0420b543f248d50de8ec1;hpb=0c99a00f9dfb4aa65dca28a55bc7c768b42f5559;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 4dcf325..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
-  clitkHndImageIO.cxx
-  clitkHndImageIOFactory.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
@@ -37,26 +47,73 @@ IF(CLITK_PRIVATE_FEATURES)
   SET(clitkCommon_SRC ${clitkCommon_SRC}
     ${PROJECT_SOURCE_DIR}/private_features/clitkUsfImageIO.cxx
     ${PROJECT_SOURCE_DIR}/private_features/clitkUsfImageIOFactory.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkUSVoxImageIO.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkUSVoxImageIOFactory.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIO.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIOFactory.cxx
     )
 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)
 
-TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES})
+### 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
+    )
+ENDIF()
 
-ADD_LIBRARY(clitkDicomRTStruct STATIC
-  clitkDicomRT_Contour.cxx
-  clitkDicomRT_ROI.cxx
-  clitkDicomRT_StructureSet.cxx
-  clitkDicomRTStruct2ImageFilter.cxx
-)
 
-TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid) 
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES} ${GDCM_LIBRARIES} ) 
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)