Merge branch 'master' into OpenGL2

[clitk.git] / cmake / dependencies.cmake

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 62a6a1503f4d0704db0810de062d85d12cd333b2..7aafbbcbc2c18f2568ff1f6c708a327e3fe963c7 100644 (file)
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -31,6 +31,9 @@ if(VTK_FOUND)
       vtkQVTK
     )
   endif(VTK_VERSION VERSION_LESS 5.6.0)
+  if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
+    add_definitions(-DVTKGL2)
+  endif()
 else(VTK_FOUND)
   message(FATAL_ERROR "Please set VTK_DIR.")
 endif(VTK_FOUND)
@@ -44,30 +47,25 @@ find_package(Gengetopt)
 
 #=========================================================
 # Find libstatgrab is installed, add clitkMemoryUsage.cxx in the library
-if(NOT DEFINED CLITK_MEMORY_INFO OR CLITK_MEMORY_INFO)
-  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")
-    set(CLITK_MEMORY_INFO ON)
-  endif(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-endif()
+#  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()
-  # ITK4 creates a target for each gdcm library when it compiles GDCM
-  get_target_property(GDCMDICTTARG gdcmDICT TYPE )
-  if(NOT GDCMDICTTARG)
-    set(CLITK_USE_SYSTEM_GDCM TRUE)
-  endif()
+# ITK4 creates a target for each gdcm library when it compiles GDCM
+get_target_property(GDCMDICTTARG gdcmDICT TYPE )
+if(NOT GDCMDICTTARG)
+  set(CLITK_USE_SYSTEM_GDCM TRUE)
 endif()
 
+