1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Set all Apple version defines in .cmake.conf

Browse Source 
Allows us to pick up these defines when building documentation on
non-Apple platforms.

Pick-to: 6.8 6.5
Change-Id: Icd1029e87a56ecfa81875f024a7d959250cd9bbe
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Tor Arne Vestbø 2024-10-31 18:40:17 +01:00
parent db9bd4ab3b
commit 0c1c3dfad2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.cmake.conf
View File

@ -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")

4
cmake/QtAutoDetectHelpers.cmake
View File

@ -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}")