X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=99e01a7fc33ad9ed7797d2651b0634653f8db357;hb=1541351548cbb579168c9f1a16fe967c42a8d66a;hp=3c7a5803ed801494be97bbb0580604cb7d42a50a;hpb=d4e9056274c04872a251d312704dcb02531792bf;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 3c7a580..99e01a7 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
@@ -55,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)
@@ -84,9 +86,22 @@ ADD_LIBRARY(clitkDicomRTStruct STATIC
   clitkDicomRT_ROI.cxx
   clitkDicomRT_StructureSet.cxx
   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}) 
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES} ${GDCM_LIBRARIES}) 
 
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)