diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-03 16:51:34 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-15 17:27:43 +0000 |
| commit | 223ffe9860c2e0a56a28d7c66164fe5073312e21 (patch) | |
| tree | a511ed9e172637c47439c31da9cc92606fd81eae /cmake | |
| parent | d1934f4ed1cee70c21f4dbf411ee4c7e8229738e (diff) | |
CMake: Override simulator architecture to x86_64 for Xcode generator
The simulator build of Qt for iOS is currently x86_64 only, instead
of universal builds with an arm64 slice as well, since we don't
support xcframeworks. This means we can't rely on Xcode's default
simulator arch settings, which on an Apple Silicon Mac will be
arm64.
Instead we override the simulator arch, like we do for qmake.
Change-Id: I8b52389db1b83f4f9679c724bcde53b44dbc76f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 6ec21881dd68dfd88dee03b11036c3c862ccbbab)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtToolchainHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtToolchainHelpers.cmake b/cmake/QtToolchainHelpers.cmake index 1caa0c0097..08f99f5210 100644 --- a/cmake/QtToolchainHelpers.cmake +++ b/cmake/QtToolchainHelpers.cmake @@ -158,8 +158,8 @@ set(__qt_chainload_toolchain_file \"\${__qt_initially_configured_toolchain_file} # xcodebuild from the command line would try to build with the wrong architecture. Also # provide an opt-out option just in case. # - # For a multi-architecture build (so simulator_and_device) we don't set an explicit - # architecture and let Xcode and the developer handle it. + # For a multi-architecture build (so simulator_and_device) we set an explicit + # architecture for simulator only, via _qt_internal_set_ios_simulator_arch. # # When using the Ninja generator, specify the first architecture from QT_OSX_ARCHITECTURES # (even with a simulator_and_device Qt build). This ensures that the default configuration |