Skip to content

Commit

Permalink
vcpkg 2024.07.12
Browse files Browse the repository at this point in the history
  • Loading branch information
nadiaholmquist committed Jul 29, 2024
1 parent 12563fb commit d62c61b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- ci/vcpkg-update
pull_request:
branches:
- master
Expand All @@ -27,7 +28,7 @@ jobs:
- name: Set up vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
- name: Build
uses: lukka/run-cmake@v10
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- ci/vcpkg-update
pull_request:
branches:
- master
Expand All @@ -26,7 +27,7 @@ jobs:
- name: Set up vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
- name: Configure
run: cmake --preset=release-mingw-x86_64
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigureVcpkg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
endif()
FetchContent_Declare(vcpkg
GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
GIT_TAG 2024.01.12
GIT_TAG 2024.07.12
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
FetchContent_MakeAvailable(vcpkg)
endif()
Expand Down

0 comments on commit d62c61b

Please sign in to comment.