diff options
author | Rayyan Ansari <rayyan@ansari.sh> | 2022-08-31 18:06:19 +0100 |
---|---|---|
committer | Rayyan Ansari <rayyan@ansari.sh> | 2022-08-31 18:06:19 +0100 |
commit | 08f5a2aa8258dd3398b9001ff34519de5830d770 (patch) | |
tree | 51dead00b16c101dc463968489c05251e4a69519 /.github/workflows | |
parent | 76c9340920532ef60d13df25d1c87bf9581074b1 (diff) |
Fix CMake prefixes
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/build-macos-universal.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/build-macos-universal.yml b/.github/workflows/build-macos-universal.yml index cbbdc5e..e4faa61 100644 --- a/.github/workflows/build-macos-universal.yml +++ b/.github/workflows/build-macos-universal.yml @@ -22,6 +22,8 @@ jobs: build-arm64: needs: prepare runs-on: [self-hosted, macOS, ARM64] + env: + homebrew_prefix: /opt/homebrew steps: - name: Create build directory @@ -29,7 +31,7 @@ jobs: - name: Configure 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 working-directory: ${{runner.workspace}}/build/arm64 @@ -38,6 +40,8 @@ jobs: build-x86_64: needs: prepare runs-on: [self-hosted, macOS, ARM64] + env: + homebrew_prefix: /usr/local steps: - name: Create build directory @@ -45,7 +49,7 @@ jobs: - name: Configure 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 working-directory: ${{runner.workspace}}/build/x86_64 |