summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-03-18 12:33:40 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-03-18 19:04:14 +0100
commit70e69f334e32f43d4040f099015c5580c6f2387a (patch)
tree8aadad89c2a1292e326971761448b1151e161f11
parentd04cf2c58b45f30ad82f409e07bd791bf36cf0c8 (diff)
cmake: Don't set CMAKE_SYSTEM_NAME=iOS when configuring with -sdk
The -sdk argument is documented as: Build Qt using Apple provided SDK <sdk>. The argument should be one of the available SDKs as listed by 'xcodebuild -showsdks'. [ChangeLog][configure] The -sdk argument no longer auto-enables the macx-ios-clang makespec. Pass -xplatform macx-ios-clang to explicitly build Qt for iOS. Change-Id: Ia4074015aba2c8296a65534c38eb2f06db32f286 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--cmake/QtProcessConfigureArgs.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index 9cfd6a2da2..68584dfc61 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -926,7 +926,7 @@ translate_string_input(android-javac-target QT_ANDROID_JAVAC_TARGET)
translate_string_input(sdk QT_APPLE_SDK)
-if(DEFINED INPUT_sdk OR (DEFINED INPUT_xplatform AND INPUT_xplatform STREQUAL "macx-ios-clang")
+if((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")
endif()