Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/Options/TileDBToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)
# Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake
message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
# To help with resolving conflicts, when you update the commit, also update its date.
set(VCPKG_COMMIT_STRING 3b9d086009cc1c2256e9c28ad44a00036fbd9b26) # 2025-10-24
set(VCPKG_COMMIT_STRING dd930e314f529c86d2703a60d5ea7dd6573d9e5a) # 2026-2-19
message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}")
include(FetchContent)
FetchContent_Declare(
Expand Down
2 changes: 1 addition & 1 deletion tiledb/sm/serialization/tiledb-rest.capnp.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef CAPNP_VERSION
#error \
"CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?"
#elif CAPNP_VERSION != 1002000
#elif CAPNP_VERSION != 1003000
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only that changed? That's nice.

#error \
"Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"builtin-baseline": "3b9d086009cc1c2256e9c28ad44a00036fbd9b26",
"builtin-baseline": "dd930e314f529c86d2703a60d5ea7dd6573d9e5a",
"dependencies": [
{
"name": "blosc2",
Expand Down
Loading