X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=a6edaf4d1349be8ad1c9017652bc0ec0eb16194d;hb=b2a15c048423c022085de60356f15ab014f75522;hp=d23e0b325204e153a3bbb198fb33526b40845677;hpb=99edafc56db3383493d259ed5bc5dad0f9623422;p=clitk.git diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d23e0b3..a6edaf4 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -22,6 +22,11 @@ SET(clitkCommon_SRC rtkHisImageIOFactory.cxx rtkHndImageIO.cxx rtkHndImageIOFactory.cxx + rtkEdfImageIO.cxx + rtkEdfImageIOFactory.cxx + clitkEsrfHstImageIO.cxx + clitkEsrfHstImageIOFactory.cxx + clitkEsrfHstXMLFileReader.cxx clitkDicomRTDoseIO.cxx clitkDicomRTDoseIOFactory.cxx clitkOrientation.cxx @@ -58,10 +63,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-.*") - 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) - 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)