]> Creatis software - clitk.git/blobdiff - common/CMakeLists.txt
Added ImagX file format from RTK
[clitk.git] / common / CMakeLists.txt
index 4a593847354570f95a7efb3dc9442b7c83061065..3c7a5803ed801494be97bbb0580604cb7d42a50a 100644 (file)
@@ -24,6 +24,9 @@ SET(clitkCommon_SRC
   rtkHndImageIOFactory.cxx
   rtkEdfImageIO.cxx
   rtkEdfImageIOFactory.cxx
+  rtkImagXImageIO.cxx
+  rtkImagXImageIOFactory.cxx
+  rtkImagXXMLFileReader.cxx
   clitkEsrfHstImageIO.cxx  
   clitkEsrfHstImageIOFactory.cxx
   clitkEsrfHstXMLFileReader.cxx
@@ -63,13 +66,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-.*")
-  #SET(GDCM_INCLUDE ".*/Source/Common")
-  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)
-  ELSE(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
-    MESSAGE("NOT USING SYSTEM_GDCM!!!!!!!")
-  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)