summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2024-04-05 14:16:09 +0200
committerTor Egge <Tor.Egge@online.no>2024-04-05 14:16:09 +0200
commitf8f0e7afcb6fac3325e72be014496e78790c1b58 (patch)
tree44797f2a56e1fda16f633120a91034d8fdc2dcbf /storage
parent7370ad575cfd758c1589f433496abad4e53cf453 (diff)
Update to protobuf 5.26.1 (C++ API).
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/CMakeLists.txt1
-rw-r--r--storage/src/vespa/storage/storageserver/rpc/CMakeLists.txt2
-rw-r--r--storage/src/vespa/storageapi/mbusprot/CMakeLists.txt2
3 files changed, 3 insertions, 2 deletions
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
$<TARGET_OBJECTS:storageapi_mbusprot>
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