Skip to content

Commit 182be4b

Browse files
build: Update vcpkg baseline to 2023.11.20
1 parent 1d1fc37 commit 182be4b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

tmpl/.github/workflows/cpp-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
uses: lukka/run-vcpkg@v11
6363
with:
6464
vcpkgDirectory: ${{ github.workspace }}/build/vcpkg
65-
vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131
65+
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
6666

6767
- name: Build ${{ matrix.triplet }}-${{ matrix.compiler }} preset
6868
uses: lukka/run-cmake@v10
@@ -113,7 +113,7 @@ jobs:
113113
uses: lukka/run-vcpkg@v11
114114
with:
115115
vcpkgDirectory: ${{ github.workspace }}/../vcpkg
116-
vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131
116+
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
117117

118118
- name: Configure x64-linux-clang preset
119119
uses: lukka/run-cmake@v10

tmpl/tools/triplets/x64-osx-clang-16-brew.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
55
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
66
set(VCPKG_OSX_ARCHITECTURES x86_64)
77
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-clang-16-brew.cmake")
8+
9+
if(PORT STREQUAL "status-code")
10+
set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DBUILD_TESTING=OFF")
11+
endif()

tmpl/vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
33
"default-registry": {
44
"kind": "builtin",
5-
"baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131"
5+
"baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6"
66
},
77
"registries": [
88
{

0 commit comments

Comments
 (0)