From cfa9691cba7dabf527d13bbeedde9eab67c8104d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 1 Nov 2024 11:28:44 +0100 Subject: [PATCH] cmake: Always export Apple version requirements The full set is needed, on all platforms, so that we can use them during documentation builds. Pick-to: 6.5 Change-Id: Ie555094a8e365fada7e43da6899e312d774eadb2 Reviewed-by: Alexandru Croitor (cherry picked from commit 179982a81a292bfe3f9dc16888f7c9777f1b2251) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicAppleHelpers.cmake | 42 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/cmake/QtPublicAppleHelpers.cmake b/cmake/QtPublicAppleHelpers.cmake index d6a5c7856c4..5d366a5c98c 100644 --- a/cmake/QtPublicAppleHelpers.cmake +++ b/cmake/QtPublicAppleHelpers.cmake @@ -731,30 +731,28 @@ function(_qt_internal_set_ios_simulator_arch target) endfunction() # Export Apple platform sdk and xcode version requirements to Qt6ConfigExtras.cmake. +# Always exported, even on non-Apple platforms, so that we can use them when building +# documentation. function(_qt_internal_export_apple_sdk_and_xcode_version_requirements out_var) - if(NOT APPLE) - return() - endif() + set(vars_to_assign + QT_SUPPORTED_MIN_IOS_SDK_VERSION + QT_SUPPORTED_MAX_IOS_SDK_VERSION + QT_SUPPORTED_MIN_IOS_XCODE_VERSION + QT_SUPPORTED_MIN_IOS_VERSION + QT_SUPPORTED_MAX_IOS_VERSION_TESTED - if(IOS) - set(vars_to_assign - QT_SUPPORTED_MIN_IOS_SDK_VERSION - QT_SUPPORTED_MAX_IOS_SDK_VERSION - QT_SUPPORTED_MIN_IOS_XCODE_VERSION - ) - elseif(VISIONOS) - set(vars_to_assign - QT_SUPPORTED_MIN_VISIONOS_SDK_VERSION - QT_SUPPORTED_MAX_VISIONOS_SDK_VERSION - QT_SUPPORTED_MIN_VISIONOS_XCODE_VERSION - ) - else() - set(vars_to_assign - QT_SUPPORTED_MIN_MACOS_SDK_VERSION - QT_SUPPORTED_MAX_MACOS_SDK_VERSION - QT_SUPPORTED_MIN_MACOS_XCODE_VERSION - ) - endif() + QT_SUPPORTED_MIN_VISIONOS_SDK_VERSION + QT_SUPPORTED_MAX_VISIONOS_SDK_VERSION + QT_SUPPORTED_MIN_VISIONOS_XCODE_VERSION + QT_SUPPORTED_MIN_VISIONOS_VERSION + QT_SUPPORTED_MAX_VISIONOS_VERSION_TESTED + + QT_SUPPORTED_MIN_MACOS_SDK_VERSION + QT_SUPPORTED_MAX_MACOS_SDK_VERSION + QT_SUPPORTED_MIN_MACOS_XCODE_VERSION + QT_SUPPORTED_MIN_MACOS_VERSION + QT_SUPPORTED_MAX_MACOS_VERSION_TESTED + ) set(assignments "") foreach(var IN LISTS vars_to_assign)