summaryrefslogtreecommitdiffstats
path: root/cmake/README.md
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-10-08 19:32:16 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-10-12 13:35:57 +0200
commit5b90b650a414c8088854e7ca84663aaa0f3528af (patch)
tree2ea74777201c2b163be50da3bb160a4336c9866e /cmake/README.md
parente57ccd45cad98bd92638937de1218c5a7b9f7baa (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/README.md')
-rw-r--r--cmake/README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/README.md b/cmake/README.md
index e8bff0ab2b..504c7bedfc 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -178,11 +178,11 @@ In order to cross-compile Qt to iOS, you need a host macOS build.
When running cmake in qtbase, pass
``-DCMAKE_SYSTEM_NAME=iOS -DQT_HOST_PATH=/path/to/your/host/build -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH``
-If you don't supply the configuration argument ``-DQT_UIKIT_SDK=...``, it will default to
-``iphonesimulator``. To target another SDK / device type, use one of the following values:
+If you don't supply the configuration argument ``-DQT_UIKIT_SDK=...``, CMake will build a
+multi-arch simulator_and_device iOS build.
+To target another SDK / device type, use one of the following values:
* iphonesimulator: ``-DQT_UIKIT_SDK=iphonesimulator``
* iphoneos: ``-DQT_UIKIT_SDK=iphoneos``
- * simulator_and_device: ``-DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DQT_UIKIT_SDK=``
Depending on what value you pass to ``-DQT_UIKIT_SDK=`` a list of target architectures is chosen
by default: