diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2020-12-01 20:24:44 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2020-12-02 07:48:29 +0200 |
| commit | 2ed189225580f49695560b59f4fe341da4444253 (patch) | |
| tree | 281e2b18a97dde8f8e2276bd40e6469eeee98b04 /dependencies.yaml | |
| parent | 07a216f327bea9a4f7880fe44eda7e27c2bbe820 (diff) | |
Conan: Fix iOS builds
Conan passes some autodetected iOS related CMake options like
CMAKE_SYSTEM_NAME, CMAKE_OSX_ARCHITECTURES, CMAKE_OSX_SYSROOT,
which apparently don't work out of the box.
- Explicitly pass 'iOS' for CMAKE_SYSTEM_NAME
- Remove the explicit sysroot 'CMAKE_OSX_SYSROOT', let CMake detect
the sysroots, to ensure that multi-arch builds work.
- Remove the conan provided architecture 'CMAKE_OSX_ARCHITECTURES',
instead rely on the architectures set by the Qt toolchain file,
which with official Qt packages most likely means multi-arch iOS.
Task-number: QTBUG-89020
Pick-to: 6.0 dev
Change-Id: I3c559f00f9391edf68bf88348baae561dc5f0991
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'dependencies.yaml')
0 files changed, 0 insertions, 0 deletions