diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-08 19:32:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-12 13:35:57 +0200 |
| commit | 5b90b650a414c8088854e7ca84663aaa0f3528af (patch) | |
| tree | 2ea74777201c2b163be50da3bb160a4336c9866e /cmake/QtProcessConfigureArgs.cmake | |
| parent | e57ccd45cad98bd92638937de1218c5a7b9f7baa (diff) | |
CMake: Implement missing iOS-related configure options
Detect an iOS build when either an -sdk option is passed
or when -xplatform macx-ios-clang is passed as a target
mkspec.
Now that CMake 3.17 is released, change the default behavior of the
iOS build to configure with simulator_and_device set to ON, like it
is with qmake.
Update the documentation regarding iOS configuration.
Change-Id: I91aaf706610b8d3c69f1ad4ba9dadee2b1e5db97
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 402ca52b24..455f98224d 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -601,6 +601,11 @@ endif() translate_string_input(android-javac-source QT_ANDROID_JAVAC_SOURCE) translate_string_input(android-javac-target QT_ANDROID_JAVAC_TARGET) +translate_string_input(sdk QT_UIKIT_SDK) +if(DEFINED INPUT_sdk OR (DEFINED INPUT_xplatform AND INPUT_xplatform STREQUAL "macx-ios-clang")) + push("-DCMAKE_SYSTEM_NAME=iOS") +endif() + drop_input(make) drop_input(nomake) |