From 601f6613b707c8d9b2a9097ddc828c33492051d7 Mon Sep 17 00:00:00 2001 From: Corey Kosak Date: Wed, 3 Jul 2024 22:11:35 -0400 Subject: [PATCH] fix(cppclient): Update protobuf to 4.25.1, update vcpkg itself to current, change build type to RelWithDebInfo --- cpp-client/README.md | 2 +- cpp-client/deephaven/vcpkg-configuration.json | 2 +- cpp-client/deephaven/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp-client/README.md b/cpp-client/README.md index d11aae49899..6e89cc7c979 100644 --- a/cpp-client/README.md +++ b/cpp-client/README.md @@ -263,7 +263,7 @@ Notes 9. Now configure the build for Deephaven Core: ``` - cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=%HOMEDRIVE%%HOMEPATH%/dhinstall -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON + cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=%HOMEDRIVE%%HOMEPATH%/dhinstall -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ``` 10. Finally, build and install Deephaven Core: diff --git a/cpp-client/deephaven/vcpkg-configuration.json b/cpp-client/deephaven/vcpkg-configuration.json index 1da16750d5f..2719e15f462 100644 --- a/cpp-client/deephaven/vcpkg-configuration.json +++ b/cpp-client/deephaven/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "git", - "baseline": "0dc005fb66801c8a8266e81bd2cedb4d5501f30e", + "baseline": "2444315f12ac0151ebcb8b28ba7cb132927f285d", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ diff --git a/cpp-client/deephaven/vcpkg.json b/cpp-client/deephaven/vcpkg.json index 1731d32195a..d7ec195ee5f 100644 --- a/cpp-client/deephaven/vcpkg.json +++ b/cpp-client/deephaven/vcpkg.json @@ -12,6 +12,6 @@ "overrides": [ { "name": "arrow", "version": "13.0.0#1" }, - { "name": "protobuf", "version": "3.21.2" } + { "name": "protobuf", "version": "4.25.1" } ] }