X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=ed51fd85016860a3db0f38be51a3eb1441ab903a;hb=ca5e9603df2cded0441b4c149c0bd9f8fa7fa483;hp=d23e0b325204e153a3bbb198fb33526b40845677;hpb=99edafc56db3383493d259ed5bc5dad0f9623422;p=clitk.git diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d23e0b3..ed51fd8 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -22,6 +22,14 @@ SET(clitkCommon_SRC rtkHisImageIOFactory.cxx rtkHndImageIO.cxx rtkHndImageIOFactory.cxx + rtkEdfImageIO.cxx + rtkEdfImageIOFactory.cxx + rtkImagXImageIO.cxx + rtkImagXImageIOFactory.cxx + rtkImagXXMLFileReader.cxx + clitkEsrfHstImageIO.cxx + clitkEsrfHstImageIOFactory.cxx + clitkEsrfHstXMLFileReader.cxx clitkDicomRTDoseIO.cxx clitkDicomRTDoseIOFactory.cxx clitkOrientation.cxx @@ -47,9 +55,9 @@ ENDIF(CLITK_PRIVATE_FEATURES) ### Declare clitkCommon library ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC}) -IF(NOT ${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND") +IF(CLITK_MEMORY_INFO) TARGET_LINK_LIBRARIES(clitkCommon statgrab) -ENDIF(NOT ${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND") +ENDIF(CLITK_MEMORY_INFO) ### Check if ITK was compiled with SYSTEM_GDCM = ON and set the gdcm libraries accordingly SET(CLITK_USE_SYSTEM_GDCM FALSE) @@ -58,10 +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-.*") - 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)