X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=a6edaf4d1349be8ad1c9017652bc0ec0eb16194d;hb=c4a6e405914867a0abfd1ac67ebe71f3ebdeb246;hp=8ad60a0618eef6b3248fde74dcc751d4e03d9ede;hpb=ce8987fa603ce1591d6d595273761d092467575d;p=clitk.git diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 8ad60a0..a6edaf4 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -24,6 +24,9 @@ SET(clitkCommon_SRC rtkHndImageIOFactory.cxx rtkEdfImageIO.cxx rtkEdfImageIOFactory.cxx + clitkEsrfHstImageIO.cxx + clitkEsrfHstImageIOFactory.cxx + clitkEsrfHstXMLFileReader.cxx clitkDicomRTDoseIO.cxx clitkDicomRTDoseIOFactory.cxx clitkOrientation.cxx @@ -60,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)