From 01d524669568296db2a5bed3dcd68886fd05ec3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 31 Oct 2024 18:40:17 +0100 Subject: [PATCH] cmake: Set all Apple version defines in .cmake.conf Allows us to pick up these defines when building documentation on non-Apple platforms. Pick-to: 6.5 Change-Id: Icd1029e87a56ecfa81875f024a7d959250cd9bbe Reviewed-by: Paul Wicking (cherry picked from commit 0c1c3dfad2cf435bde81c11545ad28b73956253c) Reviewed-by: Qt Cherry-pick Bot --- .cmake.conf | 9 +++++++-- cmake/QtAutoDetectHelpers.cmake | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cmake.conf b/.cmake.conf index 8f497fa747a..c00c2e7dcd6 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -36,17 +36,22 @@ set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_APPLE "3.21") set(QT_MIN_NEW_POLICY_CMAKE_VERSION "3.16") set(QT_MAX_NEW_POLICY_CMAKE_VERSION "3.21") -# These should be updated together with the documentation in -# qtdoc/doc/src/platforms/supported-platforms.qdocinc +# Apple version constraints. Used when building Qt and documentation set(QT_SUPPORTED_MIN_MACOS_SDK_VERSION "14") set(QT_SUPPORTED_MAX_MACOS_SDK_VERSION "15") set(QT_SUPPORTED_MIN_MACOS_XCODE_VERSION "15") +set(QT_SUPPORTED_MIN_MACOS_VERSION "12") +set(QT_SUPPORTED_MAX_MACOS_VERSION_TESTED "15") set(QT_SUPPORTED_MIN_IOS_SDK_VERSION "17") set(QT_SUPPORTED_MAX_IOS_SDK_VERSION "18") set(QT_SUPPORTED_MIN_IOS_XCODE_VERSION "15") +set(QT_SUPPORTED_MIN_IOS_VERSION "16") +set(QT_SUPPORTED_MAX_IOS_VERSION_TESTED "18") set(QT_SUPPORTED_MIN_VISIONOS_SDK_VERSION "1") set(QT_SUPPORTED_MAX_VISIONOS_SDK_VERSION "2") set(QT_SUPPORTED_MIN_VISIONOS_XCODE_VERSION "15") +set(QT_SUPPORTED_MIN_VISIONOS_VERSION "1") +set(QT_SUPPORTED_MAX_VISIONOS_VERSION_TESTED "2") diff --git a/cmake/QtAutoDetectHelpers.cmake b/cmake/QtAutoDetectHelpers.cmake index 964edafecff..a3fe523f96b 100644 --- a/cmake/QtAutoDetectHelpers.cmake +++ b/cmake/QtAutoDetectHelpers.cmake @@ -260,9 +260,9 @@ function(qt_auto_detect_apple) if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) if(NOT CMAKE_SYSTEM_NAME) # macOS - set(version "12.0") + set(version "${QT_SUPPORTED_MIN_MACOS_VERSION}") elseif(CMAKE_SYSTEM_NAME STREQUAL iOS) - set(version "16.0") + set(version "${QT_SUPPORTED_MIN_IOS_VERSION}") endif() if(version) set(CMAKE_OSX_DEPLOYMENT_TARGET "${version}" CACHE STRING "${description}")