From 70e69f334e32f43d4040f099015c5580c6f2387a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 18 Mar 2024 12:33:40 +0100 Subject: cmake: Don't set CMAKE_SYSTEM_NAME=iOS when configuring with -sdk The -sdk argument is documented as: Build Qt using Apple provided 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 --- cmake/QtProcessConfigureArgs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- cgit v1.2.3