Skip to content

Commit 7682dee

Browse files
hebastoRandyMcMillan
authored andcommitted
cmake: Mark more Qt package variables as advanced
This change cleans up the user-facing part of the CMake cache following the migration to Qt 6. An exception has been documented.
1 parent 8cd4497 commit 7682dee

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

cmake/module/FindQt.cmake

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ find_package_handle_standard_args(Qt
4040
VERSION_VAR Qt${Qt_FIND_VERSION_MAJOR}_VERSION
4141
)
4242

43-
foreach(component IN LISTS Qt_FIND_COMPONENTS ITEMS "")
44-
mark_as_advanced(Qt${Qt_FIND_VERSION_MAJOR}${component}_DIR)
43+
# Mark all variables as advanced, except Qt6_DIR.
44+
# The latter can be helpful on some systems.
45+
# See: https://github.com/bitcoin/bitcoin/issues/32536.
46+
foreach(component IN LISTS Qt_FIND_COMPONENTS)
47+
mark_as_advanced(
48+
Qt${Qt_FIND_VERSION_MAJOR}${component}_DIR
49+
Qt${Qt_FIND_VERSION_MAJOR}${component}Tools_DIR
50+
)
4551
endforeach()
52+
mark_as_advanced(
53+
QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH
54+
QT_ADDITIONAL_PACKAGES_PREFIX_PATH
55+
XKB_INCLUDE_DIR
56+
XKB_LIBRARY
57+
)

0 commit comments

Comments
 (0)