From 10215eee1b1fa15d701aa3f30a06a71b09f77720 Mon Sep 17 00:00:00 2001 From: Pavel Pautov Date: Tue, 16 Jul 2024 14:13:31 -0700 Subject: [PATCH] Support building with latest gRPC versions (up to v1.65.0). --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 645c5d5..b745342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,10 +34,14 @@ else() set(gRPC_USE_PROTO_LITE ON CACHE INTERNAL "") set(gRPC_INSTALL OFF CACHE INTERNAL "") + set(gRPC_USE_SYSTEMD OFF CACHE INTERNAL "") + set(gRPC_DOWNLOAD_ARCHIVES OFF CACHE INTERNAL "") set(gRPC_CARES_PROVIDER package CACHE INTERNAL "") set(gRPC_SSL_PROVIDER package CACHE INTERNAL "") set(gRPC_ZLIB_PROVIDER package CACHE INTERNAL "") + set(protobuf_INSTALL OFF CACHE INTERNAL "") + set(CMAKE_POSITION_INDEPENDENT_CODE ON) FetchContent_MakeAvailable(grpc) @@ -108,8 +112,8 @@ add_custom_command( --plugin protoc-gen-grpc=$ ${PROTOS} # remove inconsequential UTF8 check during serialization to aid performance - COMMAND sed -i.bak - -e [[/ ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(/,/);/d]] + COMMAND sed -i.bak -E + -e [[/ ::(PROTOBUF_NAMESPACE_ID|google::protobuf)::internal::WireFormatLite::VerifyUtf8String\(/,/\);/d]] ${PROTO_SOURCES} DEPENDS ${PROTOS} protobuf::protoc gRPC::grpc_cpp_plugin VERBATIM)