X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2Fdependencies.cmake;h=25b613bf4a069a8a9c6e015184486a366700cf27;hb=f4eb79e1b67e9c592a1deba19aa94af365bf2df9;hp=747cd52a0486a59a5d8597117adb767d82004368;hpb=8cffc479dd4097920b47cb8b8d828b3ba40c1148;p=clitk.git

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 747cd52..25b613b 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -3,9 +3,9 @@
 find_package(ITK)
 if(ITK_FOUND)
   include("${ITK_USE_FILE}")
-  if(ITK_VERSION VERSION_GREATER_EQUAL 5.0.0)
+  if(ITK_VERSION VERSION_GREATER 5.0.0 OR ITK_VERSION VERSION_EQUAL 5.0.0)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  endif(ITK_VERSION VERSION_GREATER_EQUAL 5.0.0)
+  endif(ITK_VERSION VERSION_GREATER 5.0.0 OR ITK_VERSION VERSION_EQUAL 5.0.0)
 else(ITK_FOUND)
   message(FATAL_ERROR "Cannot build without ITK.  Please set ITK_DIR.")
 endif(ITK_FOUND)
@@ -60,11 +60,11 @@ endif()
 
 
 #=========================================================
-### Check if ITK was compiled with SYSTEM_GDCM = ON
+### Check if ITK was compiled with SYSTEM_GDCM = ON (Not possible anymore with ITK 4.13)
+### Add option to activate external GDCM in clitk
 set(CLITK_USE_SYSTEM_GDCM FALSE)
-# ITK4 creates a target for each gdcm library when it compiles GDCM
-get_target_property(GDCMDICTTARG gdcmDICT TYPE )
-if(NOT GDCMDICTTARG)
+if(CLITK_EXTERNAL_GDCM)
+  message("Be sure to use external GDCM with ITK")
   set(CLITK_USE_SYSTEM_GDCM TRUE)
 endif()