Merge branch 'master' into GammaIndex3D

[clitk.git] / cmake / build_opt.cmake

diff --git a/cmake/build_opt.cmake b/cmake/build_opt.cmake
index 48ba5a67e01640afef43706b163cbff8b8aa3636..2331750a80c279520f69d917f6820cffe4d11911 100644 (file)
--- a/cmake/build_opt.cmake
+++ b/cmake/build_opt.cmake
@@ -19,6 +19,7 @@ endif(BUILD_DOXYGEN)
 
 # Compilation options
 option(CLITK_EXPERIMENTAL "Enable experimental software and features" OFF)
+mark_as_advanced(CLITK_EXPERIMENTAL)
 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)
@@ -26,11 +27,15 @@ 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)
-    set(vv_QT_VERSION "4" CACHE STRING "Expected Qt version")
-    set_property(CACHE vv_QT_VERSION PROPERTY STRINGS 4 5)
-    if(NOT (vv_QT_VERSION VERSION_EQUAL "4" OR vv_QT_VERSION VERSION_EQUAL "5"))
-      message(FATAL_ERROR "Expected value for vv_QT_VERSION is either '4' or '5'")
+ 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)