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

vcpkg 2024.07.12

This commit is contained in:
Nadia Holmquist Pedersen 2024-07-30 00:43:15 +02:00
parent 12563fb636
commit d62c61ba08
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build-macos.yml vendored
View File

@ -4,6 +4,7 @@ on:
push: push:
branches: branches:
- master - master
- ci/vcpkg-update
pull_request: pull_request:
branches: branches:
- master - master
@ -27,7 +28,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
- name: Build - name: Build
uses: lukka/run-cmake@v10 uses: lukka/run-cmake@v10
with: with:

3
.github/workflows/build-windows.yml vendored
View File

@ -4,6 +4,7 @@ on:
push: push:
branches: branches:
- master - master
- ci/vcpkg-update
pull_request: pull_request:
branches: branches:
- master - master
@ -26,7 +27,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
- name: Configure - name: Configure
run: cmake --preset=release-mingw-x86_64 run: cmake --preset=release-mingw-x86_64
- name: Build - name: Build

2
cmake/ConfigureVcpkg.cmake
View File

@ -9,7 +9,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
endif() endif()
FetchContent_Declare(vcpkg FetchContent_Declare(vcpkg
GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git" GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
GIT_TAG 2024.01.12 GIT_TAG 2024.07.12
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg") SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
FetchContent_MakeAvailable(vcpkg) FetchContent_MakeAvailable(vcpkg)
endif() endif()