path: root/cmake/
diff options
authorJoerg Bornemann <>2021-09-30 15:05:52 +0200
committerJoerg Bornemann <>2021-10-05 19:35:47 +0200
commit165e01d5d51d16377542c1b3ffbc22f03fb75e97 (patch)
treee118b1ac097480798769ea6f3d480ed10b0f35c5 /cmake/
parent719990d4ef4729ba5e145306f555bcd73ea944e7 (diff)
CMake: Ensure that UNIX is set for INTEGRITY
Certain platform-related variables, in this case UNIX, must be set in a platform module, because they get cleared after the toolchain file is loaded. Such platform modules live in upstream CMake, but there is none yet for INTEGRITY. This manifests in an undefined UNIX variable and "System is unknown to CMake" warnings for the project and every configure test. Add the CMake module "Platform/Integrity" in the cmake/platforms directory. Add this directory to CMAKE_MODULE_PATH to let CMake load Platform/Integrity when the toolchain file set CMAKE_SYSTEM_NAME to "Integrity". CMake's module directory takes precedence, when loading platform modules. This is special for platform modules and different from the documented behavior of CMAKE_MODULE_PATH and include(). In case the user wants to provide their own platform modules via CMAKE_MODULE_PATH, they can instruct Qt to not add its path by setting QT_AVOID_CUSTOM_PLATFORM_MODULES to ON. Make sure that configure tests with project files also load the custom platform module. Pick-to: 6.2 Fixes: QTBUG-96998 Change-Id: I9855d620d24dc66353cec5e847a2675b464ace26 Reviewed-by: Alexandru Croitor <>
Diffstat (limited to 'cmake/')
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/ b/cmake/
index 38a7431620..79a37fd95a 100644
--- a/cmake/
+++ b/cmake/
@@ -70,6 +70,12 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_
+# Let CMake load our custom platform modules.
+# CMake-provided platform modules take precedence.
# Handle packages located in QT_ADDITIONAL_PACKAGES_PREFIX_PATH when cross-compiling. Needed for
# Conan.
# We prepend to CMAKE_PREFIX_PATH so that a find_package(Qt6Foo) call works, without having to go