From: Romulo Pinho <romulo.pinho@lyon.unicancer.fr>
Date: Thu, 15 Nov 2012 08:50:48 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~239^2~13^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=c18ab5232cf7d80c10c0805e9566b54fb8c6f875;hp=-c;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

c18ab5232cf7d80c10c0805e9566b54fb8c6f875
diff --combined common/CMakeLists.txt
index b90df14,efe81ed..4a59384
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@@ -15,13 -15,18 +15,18 @@@ SET(clitkCommon_SR
    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
+   clitkEsrfHstImageIO.cxx  
+   clitkEsrfHstImageIOFactory.cxx
+   clitkEsrfHstXMLFileReader.cxx
    clitkDicomRTDoseIO.cxx
    clitkDicomRTDoseIOFactory.cxx
    clitkOrientation.cxx
@@@ -59,11 -64,8 +64,11 @@@ IF(ITK_VERSION_MAJOR LESS "4"
    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(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(ITK_VERSION_MAJOR LESS "4")