From 9584feecdd70f66e037e98f6386edcb342cb85c7 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 15 Nov 2022 10:44:44 +0100 Subject: ci: install sdl2 from homebrew --- .github/workflows/cmake.yml | 7 ++++++- userconfig-runner@Darwin-Clang.cmake | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index bc37c112..3284c146 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -36,7 +36,7 @@ jobs: version: 1.11.1 if: matrix.os != 'ubuntu-22.04' - - name: Install Linux Dependencies + - name: Install Linux dependencies run: | sudo apt -q=2 update sudo apt install g++-12 gdb ninja-build @@ -44,6 +44,11 @@ jobs: sudo apt -q install libsdl2-dev if: matrix.os == 'ubuntu-22.04' + - name: Install OSX dependencies + run: | + brew install SDL2 + if: matrix.os == 'macos-12' + - name: Configure run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DFLOORMAT_PRECOMPILED-HEADERS:BOOL=OFF diff --git a/userconfig-runner@Darwin-Clang.cmake b/userconfig-runner@Darwin-Clang.cmake index 7f526b9a..e5e59fd8 100644 --- a/userconfig-runner@Darwin-Clang.cmake +++ b/userconfig-runner@Darwin-Clang.cmake @@ -1,4 +1,5 @@ sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) +sets(BOOL FLOORMAT_SUBMODULE-SDL2 OFF) add_link_options(-framework IOKit) -- cgit v1.2.3