diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-04-22 15:38:29 +0300 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2021-04-23 06:02:47 +0000 |
| commit | 0d3d17d3883006d1bc63895b4d8076eb9ba24122 (patch) | |
| tree | 6c43f040c80d27747aadbf85526cc5207d926222 /coin | |
| parent | 5f38d6aa61a8b8f78a2b9aadfbe167420ec061f2 (diff) | |
Add target arch for universal macOS target
This makes the field to reflect reality as otherwise it will be
resolved from the template and excludes the arm64.
Change-Id: I39972e47ba2a0ab9fe4322c844b60383187a762b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/macos.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index c99c440e..df940372 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -6,6 +6,7 @@ Configurations: Id: 'macos-latest-xcode-universal-packaging-build' Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' + Target arch: 'x86_64+arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests'] Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' Environment variables: [ |