From: jean-pierre roux Date: Wed, 24 Nov 2010 14:28:24 +0000 (+0000) Subject: ITK vs GDCM (avoid cmake break) X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=488c9819601126f83b399a23e1e5cbdbffa13ffa;p=crea.git ITK vs GDCM (avoid cmake break) (Shouldn't be user pb!) --- diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 90f1ab0..2d030ab 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -172,6 +172,7 @@ IF(USE_GDCM2) MESSAGE(ERROR "CANNOT USE BOTH gdcm AND gdcm2 !") ENDIF (USE_GDCM) + IF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break) # Search GDCM2 FIND_PACKAGE(GDCM REQUIRED) INCLUDE(${GDCM_USE_FILE}) @@ -216,7 +217,8 @@ IF(USE_GDCM2) ENDIF(USE_VTK) ENDIF(USE_GDCM_VTK) - + ENDIF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break) + ENDIF(USE_GDCM2) #-----------------------------------------------------------------------------