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

diff --combined common/CMakeLists.txt
index b90df141344ae0f4e4963b237f6b174edf9c5966,efe81edce046f25702940723f46f97c94c47ac5f..4a593847354570f95a7efb3dc9442b7c83061065
--- 1/common/CMakeLists.txt
--- 2/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")