diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-18 11:58:22 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-18 19:04:14 +0100 |
| commit | d04cf2c58b45f30ad82f409e07bd791bf36cf0c8 (patch) | |
| tree | 6fc4fe82023820921228527a1018c5275bc1201f /cmake/QtProcessConfigureArgs.cmake | |
| parent | 09705c74b2987b9b3a0eaf75d7f80187911312ad (diff) | |
cmake: Rename QT_UIKIT_SDK to QT_APPLE_SDK
The SDK is relevant for all Apple systems, including macOS, iOS, tvOS,
watchOS, and visionOS.
We still pick up -DQT_UIKIT_SDK for iOS for compatibility.
[ChangeLog][CMake] The -sdk configure argument now maps
to the QT_APPLE_SDK CMake variable. QT_UIKIT_SDK is still
supported for iOS builds for compatibility.
Change-Id: I983a2f23c2414eb73cd35bb83738088defb45cbd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 02e6de9516..9cfd6a2da2 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -924,8 +924,8 @@ endif() translate_string_input(android-javac-source QT_ANDROID_JAVAC_SOURCE) translate_string_input(android-javac-target QT_ANDROID_JAVAC_TARGET) -# FIXME: config_help.txt says -sdk should apply to macOS as well. -translate_string_input(sdk QT_UIKIT_SDK) +translate_string_input(sdk QT_APPLE_SDK) + if(DEFINED INPUT_sdk OR (DEFINED INPUT_xplatform AND INPUT_xplatform STREQUAL "macx-ios-clang") OR (DEFINED INPUT_platform AND INPUT_platform STREQUAL "macx-ios-clang")) push("-DCMAKE_SYSTEM_NAME=iOS") |