X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=c64d06b72d1734fb05abfbfcc7daaba52e8b3f93;hb=783500a9fc085bb14bff81a95a76f84eea8b177a;hp=ed51fd85016860a3db0f38be51a3eb1441ab903a;hpb=ad13cf07dde9cf2b43bf902c3da442e1c4d751f6;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ed51fd8..c64d06b 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -24,6 +24,8 @@ SET(clitkCommon_SRC
   rtkHndImageIOFactory.cxx
   rtkEdfImageIO.cxx
   rtkEdfImageIOFactory.cxx
+  rtkXRadImageIO.cxx
+  rtkXRadImageIOFactory.cxx
   rtkImagXImageIO.cxx
   rtkImagXImageIOFactory.cxx
   rtkImagXXMLFileReader.cxx
@@ -59,34 +61,33 @@ 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 
+IF (CLITK_USE_SYSTEM_GDCM)
+  FIND_PACKAGE(GDCM REQUIRED)
+  #DD(GDCM_USE_FILE)
+  #DD(GDCM_INCLUDE_DIRS)
+  #DD(GDCM_LIBRARY_DIRS)
+  #DD(CLITK_GDCM_LIBRARIES)
+  #FIND_LIBRARY(A gdcmDICT ${GDCM_LIBRARY_DIRS})
+  #FIND_LIBRARY(B gdcmMSFF ${GDCM_LIBRARY_DIRS})
+  #FIND_LIBRARY(C vtkgdcm ${GDCM_LIBRARY_DIRS})
+ENDIF()
 
-TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
+TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${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}) 
+IF (CLITK_USE_SYSTEM_GDCM)
+  TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid vtkgdcm)
+ELSE()
+  TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid)
+ENDIF()
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)