X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2Fbuild_opt.cmake;h=ff66917f4d20d96c41247239f9b978420aa78c74;hb=4480e52377d1150ca781c96e359b3164b65c3503;hp=4a2ca009a14689b04d37c7512d3c7e9b9ba13bbb;hpb=a4b0c9702a1d102f07eafa205a62cf46c0c625aa;p=clitk.git

diff --git a/cmake/build_opt.cmake b/cmake/build_opt.cmake
index 4a2ca00..ff66917 100644
--- a/cmake/build_opt.cmake
+++ b/cmake/build_opt.cmake
@@ -19,12 +19,28 @@ 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_EXTERNAL_GDCM "Enable features using external GDCM" OFF)
+mark_as_advanced(CLITK_EXTERNAL_GDCM)
 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)
 
 option(CLITK_BUILD_VV "Build vv the 4D visualizer (requires VTK and QT)" ON)
+
 if(CLITK_BUILD_VV)
+ if(VTK_VERSION VERSION_LESS 6.0.0)
+    set(vv_QT_VERSION "4" CACHE INTERNAL "Expected Qt version")
+ else()
+    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)
 endif(CLITK_BUILD_VV)