X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2Fdependencies.cmake;h=7b389c246203d2ac0601a59045184739ffef363e;hb=0b69855f265de2c9f13f717ec67265df8b1cbd96;hp=9246eaacb3c217cc909d602a17b38fc894da18d1;hpb=21773137da4cce358713ef3bdc6296a3131849a6;p=clitk.git

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 9246eaa..7b389c2 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -23,9 +23,14 @@ IF(VTK_FOUND)
       vtkWidgets
       vtkImaging
       vtkHybrid
-      QVTK
       )
   ENDIF(VTK_VERSION VERSION_LESS 5.8.0)
+  IF(VTK_VERSION VERSION_LESS 5.6.0)
+    SET ( VTK_LIBRARIES
+      ${VTK_LIBRARIES}
+      vtkQVTK
+    )
+  ENDIF(VTK_VERSION VERSION_LESS 5.6.0)
 ELSE(VTK_FOUND)
   MESSAGE(FATAL_ERROR "Please set VTK_DIR.")
 ENDIF(VTK_FOUND)
@@ -39,12 +44,32 @@ FIND_PACKAGE(Gengetopt)
 
 #=========================================================
 # Find libstatgrab is installed, add clitkMemoryUsage.cxx in the library
-FIND_LIBRARY(LIBSTATGRAB NAMES statgrab PATHS)
-IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+IF (NOT DEFINED CLITK_MEMORY_INFO OR CLITK_MEMORY_INFO)
+  FIND_LIBRARY(LIBSTATGRAB NAMES statgrab PATHS)
+  IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
 #  MESSAGE("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
-  SET(CLITK_MEMORY_INFO OFF)
-ELSE (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-  INCLUDE_DIRECTORIES(${LIBSTATGRAB}/../include)
-  SET(CLITK_MEMORY_INFO ON)
-ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")  
+    SET(CLITK_MEMORY_INFO OFF)
+  ELSE (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+    SET(CLITK_MEMORY_INFO ON)
+  ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")  
+ENDIF()
 #=========================================================
+
+
+#=========================================================
+### Check if ITK was compiled with SYSTEM_GDCM = ON
+SET(CLITK_USE_SYSTEM_GDCM FALSE)
+IF(ITK_VERSION_MAJOR LESS "4")
+  IF(ITK_USE_SYSTEM_GDCM)
+    SET(CLITK_USE_SYSTEM_GDCM TRUE) 
+  ENDIF(ITK_USE_SYSTEM_GDCM)
+ELSE(ITK_VERSION_MAJOR LESS "4")
+  SET(GDCM_INCLUDE_INSTALL ".*include/gdcm-.*")
+  SET(GDCM_INCLUDE_BUILD ".*/Source/MediaStorageAndFileFormat")
+  IF(NOT ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_BUILD})
+    SET(CLITK_USE_SYSTEM_GDCM TRUE)
+  ENDIF()
+ENDIF(ITK_VERSION_MAJOR LESS "4")
+SET(CLITK_USE_SYSTEM_GDCM FALSE)
+#DD(CLITK_USE_SYSTEM_GDCM)
+