From c4a6e405914867a0abfd1ac67ebe71f3ebdeb246 Mon Sep 17 00:00:00 2001 From: Romulo Pinho Date: Thu, 15 Nov 2012 10:03:49 +0100 Subject: [PATCH] Handling SYSTEM GDCM build and install trees (correction) --- common/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 4a59384..a6edaf4 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -63,13 +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-.*") - #SET(GDCM_INCLUDE ".*/Source/Common") - 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) - ELSE(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE}) - MESSAGE("NOT USING SYSTEM_GDCM!!!!!!!") - 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) -- 2.47.1