From d62c61ba0814e34035749ec6237872b01d79c03a Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Tue, 30 Jul 2024 00:43:15 +0200 Subject: [PATCH] vcpkg 2024.07.12 --- .github/workflows/build-macos.yml | 3 ++- .github/workflows/build-windows.yml | 3 ++- cmake/ConfigureVcpkg.cmake | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 4178157d..9a5830e0 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - ci/vcpkg-update pull_request: branches: - master @@ -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: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index b224d62a..5470e7b8 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - ci/vcpkg-update pull_request: branches: - master @@ -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 diff --git a/cmake/ConfigureVcpkg.cmake b/cmake/ConfigureVcpkg.cmake index c08e42cb..fa6e2b00 100644 --- a/cmake/ConfigureVcpkg.cmake +++ b/cmake/ConfigureVcpkg.cmake @@ -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()