diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-17 10:19:10 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-17 21:30:34 +0200 |
| commit | 3d2dc88850b6ba030238791dcd4a4ec44bb2479d (patch) | |
| tree | b836ff389488586b67c380b6372ac8d8660f550b /cmake | |
| parent | 67dae9e6ee1c17cbdbfd015b43e27a41a8040409 (diff) | |
configure: Fix iOS option to be passed for both platform and xplatform
Task-number: QTBUG-95838
Pick-to: 6.2
Change-Id: If0617e1d9c47595d4a350a91ab4f7d47546ebf08
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index c13c2dde35..024925435e 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -807,8 +807,10 @@ 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) -if(DEFINED INPUT_sdk OR (DEFINED INPUT_xplatform AND INPUT_xplatform STREQUAL "macx-ios-clang")) +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") endif() |