ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CMake prefixes

This commit is contained in:
Rayyan Ansari 2022-08-31 18:06:19 +01:00
parent 76c9340920
commit 08f5a2aa82
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build-macos-universal.yml vendored
View File

@ -22,6 +22,8 @@ jobs:
build-arm64: build-arm64:
needs: prepare needs: prepare
runs-on: [self-hosted, macOS, ARM64] runs-on: [self-hosted, macOS, ARM64]
env:
homebrew_prefix: /opt/homebrew
steps: steps:
- name: Create build directory - name: Create build directory
@ -29,7 +31,7 @@ jobs:
- name: Configure - name: Configure
working-directory: ${{runner.workspace}}/build/arm64 working-directory: ${{runner.workspace}}/build/arm64
run: arch -arm64 /opt/homebrew/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DUSE_QT6=ON run: arch -arm64 ${{env.homebrew_prefix}}/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="${{env.homebrew_prefix}}/opt/qt@6;${{env.homebrew_prefix}}/opt/libarchive" -DMACOS_BUNDLE_LIBS=ON -DUSE_QT6=ON
- name: Make - name: Make
working-directory: ${{runner.workspace}}/build/arm64 working-directory: ${{runner.workspace}}/build/arm64
@ -38,6 +40,8 @@ jobs:
build-x86_64: build-x86_64:
needs: prepare needs: prepare
runs-on: [self-hosted, macOS, ARM64] runs-on: [self-hosted, macOS, ARM64]
env:
homebrew_prefix: /usr/local
steps: steps:
- name: Create build directory - name: Create build directory
@ -45,7 +49,7 @@ jobs:
- name: Configure - name: Configure
working-directory: ${{runner.workspace}}/build/x86_64 working-directory: ${{runner.workspace}}/build/x86_64
run: arch -x86_64 /usr/local/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DUSE_QT6=ON run: arch -x86_64 ${{env.homebrew_prefix}}/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="${{env.homebrew_prefix}}/opt/qt@6;${{env.homebrew_prefix}}/opt/libarchive" -DMACOS_BUNDLE_LIBS=ON -DUSE_QT6=ON
- name: Make - name: Make
working-directory: ${{runner.workspace}}/build/x86_64 working-directory: ${{runner.workspace}}/build/x86_64