diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-03-25 11:14:54 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-03-31 08:38:37 +0000 |
| commit | 132bd9e8789ab30902a0ff516ed90803b1e0dd68 (patch) | |
| tree | 7cc293a49882d9ee97db3be7bc401aa57f68b179 | |
| parent | b63cdb942a6a69c78f31e65744383c955044a2fb (diff) | |
GitHub: Create universal binaries on macOS7.0
Change-Id: I52d6490826cf00ed0e7c18525150f717e89c9416
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rw-r--r-- | .github/workflows/build_cmake.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index d22fdb4..5ac8182 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -217,6 +217,10 @@ jobs: endforeach() endif() + if ("${{ runner.os }}" STREQUAL "macOS") + set(ADDITIONAL_BUILD_ARGS "--add-config=-DCMAKE_OSX_ARCHITECTURES=x86_64\;arm64") + endif() + set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ") set(build_plugin_py "scripts/build_plugin.py") @@ -237,6 +241,7 @@ jobs: --qt-path "${{ steps.qt.outputs.qt_dir }}" --qtc-path "${{ steps.qt_creator.outputs.qtc_dir }}" --output-path "$ENV{GITHUB_WORKSPACE}" + ${ADDITIONAL_BUILD_ARGS} RESULT_VARIABLE result ) if (NOT result EQUAL 0) |