X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2Fbuild_opt.cmake;h=54a35317f71a5373d213f1f3d52b152ae0869f59;hb=01a0dd7b79c5e5d5b82878d9e64dcba12891b53d;hp=502a05656364deaaa86b02eef2642a134b1c42d8;hpb=bdee540d89920d23994cd848a020cf1081f0976b;p=clitk.git

diff --git a/cmake/build_opt.cmake b/cmake/build_opt.cmake
index 502a056..54a3531 100644
--- a/cmake/build_opt.cmake
+++ b/cmake/build_opt.cmake
@@ -20,6 +20,8 @@ endif(BUILD_DOXYGEN)
 # Compilation options
 option(CLITK_EXPERIMENTAL "Enable experimental software and features" OFF)
 mark_as_advanced(CLITK_EXPERIMENTAL)
+option(CLITK_MEMORY_INFO "Enable memory info (need libstatgrab >= v.0.90)" OFF)
+mark_as_advanced(CLITK_MEMORY_INFO)
 option(CLITK_BUILD_TOOLS "Build command-line tools" OFF)
 option(CLITK_BUILD_SEGMENTATION "Build command-line segmentation tools" OFF)
 option(CLITK_BUILD_REGISTRATION "Build command-line registration tools" OFF)
@@ -30,7 +32,11 @@ if(CLITK_BUILD_VV)
  if(VTK_VERSION VERSION_LESS 6.0.0)
     set(vv_QT_VERSION "4" CACHE INTERNAL "Expected Qt version")
  else()
-    set(vv_QT_VERSION "5" CACHE INTERNAL "Expected Qt version")
+    if(VTK_QT_VERSION VERSION_LESS 5)
+       set(vv_QT_VERSION "4" CACHE INTERNAL "Expected Qt version")
+    else()
+       set(vv_QT_VERSION "5" CACHE INTERNAL "Expected Qt version")
+    endif()
  endif()
 
   add_subdirectory(${CLITK_SOURCE_DIR}/vv ${PROJECT_BINARY_DIR}/vv)