From c37c1f7ac3be293b63e266378926f0c6706fd393 Mon Sep 17 00:00:00 2001 From: Pierre Wendling Date: Tue, 26 Jul 2022 15:24:38 -0400 Subject: [PATCH] CI: Make macOS universal build with CMake. --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7cfc3f20a..35f458799 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: platform: - { name: Windows (mingw32), os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, cc: gcc } - { name: Windows (mingw64+clang), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, cc: clang } - - { name: Linux (CMake), os: ubuntu-20.04, shell: sh, flags: true } + - { name: Linux (CMake), os: ubuntu-20.04, shell: sh } - { name: Linux (autotools), os: ubuntu-20.04, shell: sh, autotools: true } - { name: MacOS (CMake), os: macos-latest, shell: sh } - { name: MacOS (autotools), os: macos-latest, shell: sh, autotools: true } @@ -108,7 +108,8 @@ jobs: -DSDL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \ -DCMAKE_INSTALL_PREFIX=cmake_prefix \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 - name: Build (CMake) if: "! matrix.platform.autotools" run: |