From 1832cc2b09a0ae4cc07b4c14d26172ace58e1a16 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 17 Aug 2021 09:56:35 +0200 Subject: [PATCH] CMake: Save value of QT_UIKIT_SDK in QtBuildInternalsExtra.cmake The value of QT_UIKIT_SDK is used in configure tests via qt_config_compile_test -> qt_get_platform_try_compile_vars. Up till now QT_UIKIT_SDK was only available in qtbase only. Save the value in BuildInternals to ensure it's used for other repos as well. Change-Id: I46f372267782f1c8e7d48c237fe0264ac72d33bb Task-number: QTBUG-95838 Reviewed-by: Joerg Bornemann (cherry picked from commit 67dae9e6ee1c17cbdbfd015b43e27a41a8040409) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPostProcessHelpers.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index f8f42d273eb..d09a8b7c058 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -542,6 +542,11 @@ endif()\n") "set(QT_IS_MACOS_UNIVERSAL \"${QT_IS_MACOS_UNIVERSAL}\" CACHE BOOL \"\")\n") endif() + if(DEFINED QT_UIKIT_SDK) + string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS + "set(QT_UIKIT_SDK \"${QT_UIKIT_SDK}\" CACHE BOOL \"\")\n") + endif() + if(CMAKE_CROSSCOMPILING AND QT_BUILD_TOOLS_WHEN_CROSSCOMPILING) string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING \"TRUE\" CACHE BOOL \"\" FORCE)\n")