diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2024-04-08 14:13:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 14:13:04 +0200 |
| commit | 113e9e80dfa106cb1ca4d7f96039976311cab8dc (patch) | |
| tree | 9fd11e524dc9d283920f383900e85d130e496a4c /searchlib | |
| parent | 88b23778c4a4bc6b3210e82f0aab015deb6a7495 (diff) | |
| parent | f8f0e7afcb6fac3325e72be014496e78790c1b58 (diff) | |
Merge pull request #30833 from vespa-engine/toregge/update-protobuf-version
Update to protobuf 5.26.1 (C++ API).
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/engine/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt index c15cf055a60..849d22455d0 100644 --- a/searchlib/src/vespa/searchlib/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/CMakeLists.txt @@ -39,6 +39,7 @@ vespa_add_library(searchlib vespalib ICU::i18n ICU::uc + protobuf::libprotobuf ${VESPA_ATOMIC_LIB} ) diff --git a/searchlib/src/vespa/searchlib/engine/CMakeLists.txt b/searchlib/src/vespa/searchlib/engine/CMakeLists.txt index b02b977f0e4..09c2002f113 100644 --- a/searchlib/src/vespa/searchlib/engine/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/engine/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(searchlib_engine_PROTOBUF_SRCS searchlib_engine_PROTOBUF_HDRS ../../../../src/protobuf/search_protocol.proto) vespa_add_source_target(protobufgen_searchlib_engine DEPENDS ${searchlib_engine_PROTOBUF_SRCS} ${searchlib_engine_PROTOBUF_HDRS}) |