From 1ea0a47c987c557d2d4d26f0838b7fcd74d8f3fe Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Mon, 25 Sep 2023 10:45:46 -0400 Subject: [PATCH] Set CMAKE_OSX_ARCHITECTURES for OSX universal build. (#130) h/t @aganders3 for [finding this](https://github.com/acquire-project/acquire-python/issues/76) --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2573622c..e37e9e14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: submodules: true - name: CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" - name: Build run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31243d11..295579da 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: - name: Package run: | - cmake -B ${{github.workspace}}/pack -DCMAKE_BUILD_TYPE=Release -DNOTEST=1 + cmake -B ${{github.workspace}}/pack -DCMAKE_BUILD_TYPE=Release -DNOTEST=1 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" cmake --build ${{github.workspace}}/pack --config Release cpack --config ${{github.workspace}}/pack/CPackConfig.cmake -C Release -G ZIP