was it a cmake conflict?

This commit is contained in:
briaguya 2024-02-19 10:03:52 -05:00
parent 61c6245b04
commit 69b615e240

View File

@ -99,7 +99,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
if: ${{ !vars.MAC_RUNNER }} if: ${{ !vars.MAC_RUNNER }}
run: | run: |
brew uninstall --ignore-dependencies libpng brew uninstall --ignore-dependencies libpng cmake
sudo port install $(cat .github/workflows/macports-deps.txt) sudo port install $(cat .github/workflows/macports-deps.txt)
brew install ninja brew install ninja
- name: Download soh.otr - name: Download soh.otr
@ -272,7 +272,7 @@ jobs:
cd libzip-1.10.1 cd libzip-1.10.1
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache .. cmake -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake
make make
make test make test
make install make install