Skip to content
Snippets Groups Projects
Commit 81435bb6 authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri :speech_balloon: Committed by Kitware Robot
Browse files

Merge topic 'vtk_qt_version'


8ba53117 Add a comment for the conditional cache variable
dba26566 Check to see if VTK_QT_VERSION is already set

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !8683
parents 39748432 8ba53117
No related branches found
No related tags found
No related merge requests found
......@@ -3,10 +3,15 @@
# version installed on the system. If both versions are
# found, Qt6 is preferred.
set(VTK_QT_VERSION "Auto" CACHE
STRING "Expected Qt major version. Valid values are Auto, 5, 6.")
set(vtk_supported_qt_versions "Auto" 5 6)
set_property(CACHE VTK_QT_VERSION PROPERTY STRINGS "${vtk_supported_qt_versions}")
# The following `if` check can be removed once CMake 3.21 is required and
# the policy CMP0126 is set to NEW for ParaView and other superbuilds.
if (NOT DEFINED VTK_QT_VERSION)
set(VTK_QT_VERSION "Auto" CACHE
STRING "Expected Qt major version. Valid values are Auto, 5, 6.")
set_property(CACHE VTK_QT_VERSION PROPERTY STRINGS "${vtk_supported_qt_versions}")
endif()
if (NOT VTK_QT_VERSION STREQUAL "Auto")
if (NOT VTK_QT_VERSION IN_LIST vtk_supported_qt_versions)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment