From f8f0e7afcb6fac3325e72be014496e78790c1b58 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Fri, 5 Apr 2024 14:16:09 +0200 Subject: Update to protobuf 5.26.1 (C++ API). --- storage/src/vespa/storage/CMakeLists.txt | 1 + storage/src/vespa/storage/storageserver/rpc/CMakeLists.txt | 2 +- storage/src/vespa/storageapi/mbusprot/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'storage') diff --git a/storage/src/vespa/storage/CMakeLists.txt b/storage/src/vespa/storage/CMakeLists.txt index e5b62f917d5..7e02124d170 100644 --- a/storage/src/vespa/storage/CMakeLists.txt +++ b/storage/src/vespa/storage/CMakeLists.txt @@ -33,6 +33,7 @@ vespa_add_library(storage $ INSTALL lib64 DEPENDS + protobuf::libprotobuf ) vespa_add_target_package_dependency(storage Protobuf) diff --git a/storage/src/vespa/storage/storageserver/rpc/CMakeLists.txt b/storage/src/vespa/storage/storageserver/rpc/CMakeLists.txt index b749f35b8bd..c920319e51a 100644 --- a/storage/src/vespa/storage/storageserver/rpc/CMakeLists.txt +++ b/storage/src/vespa/storage/storageserver/rpc/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -find_package(Protobuf REQUIRED) +set(PROTOBUF_GENERATE_CPP_APPEND_PATH ON) PROTOBUF_GENERATE_CPP(storage_storageserver_rpc_PROTOBUF_SRCS storage_storageserver_rpc_PROTOBUF_HDRS protobuf/rpc_envelope.proto ) diff --git a/storage/src/vespa/storageapi/mbusprot/CMakeLists.txt b/storage/src/vespa/storageapi/mbusprot/CMakeLists.txt index 171e8918f71..fa9d9b165a1 100644 --- a/storage/src/vespa/storageapi/mbusprot/CMakeLists.txt +++ b/storage/src/vespa/storageapi/mbusprot/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -find_package(Protobuf REQUIRED) +set(PROTOBUF_GENERATE_CPP_APPEND_PATH ON) PROTOBUF_GENERATE_CPP(storageapi_PROTOBUF_SRCS storageapi_PROTOBUF_HDRS protobuf/common.proto protobuf/feed.proto -- cgit v1.2.3