fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(macos/windows): automatically use vcpkg

Browse Source 
Previously `CMAKE_TOOLCHAIN_FILE` needed to be set manually, which was
kinda pointless when vcpkg is already installed and meant to be used

Signed-off-by: Seth Flynn <getchoo@tuta.io>
This commit is contained in:
Seth Flynn
2026-01-06 17:08:44 -05:00
parent 31da9f51f0
commit 44bf3aad29
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/setup-dependencies/macos/action.yml vendored
View File

@@ -44,4 +44,4 @@ runs:
- name: Setup vcpkg environment - name: Setup vcpkg environment
shell: bash shell: bash
run: | run: |
echo "CMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" >> "$GITHUB_ENV" echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> "$GITHUB_ENV"

2
.github/actions/setup-dependencies/windows/action.yml vendored
View File

@@ -57,7 +57,7 @@ runs:
if: ${{ inputs.msystem == '' }} if: ${{ inputs.msystem == '' }}
shell: bash shell: bash
run: | run: |
echo "CMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" >> "$GITHUB_ENV" echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> "$GITHUB_ENV"
- name: Setup MSYS2 (MinGW) - name: Setup MSYS2 (MinGW)
if: ${{ inputs.msystem != '' }} if: ${{ inputs.msystem != '' }}

7
CMakePresets.json
View File

@@ -41,6 +41,9 @@
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
"rhs": "Darwin" "rhs": "Darwin"
},
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
} }
}, },
{ {
@@ -50,6 +53,7 @@
"macos" "macos"
], ],
"cacheVariables": { "cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64", "CMAKE_OSX_ARCHITECTURES": "x86_64;arm64",
"VCPKG_TARGET_TRIPLET": "universal-osx" "VCPKG_TARGET_TRIPLET": "universal-osx"
} }
@@ -76,6 +80,9 @@
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
"rhs": "Windows" "rhs": "Windows"
},
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
} }
} }
], ],