From 7411d0fd69415cd689a8090869f78c40bcc97edb Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 8 Nov 2023 18:39:55 +0100 Subject: [PATCH] gRPC: Only OS gRPC is supported --- grpc/CMakeLists.txt | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/grpc/CMakeLists.txt b/grpc/CMakeLists.txt index 55278ed3..f9365a4a 100644 --- a/grpc/CMakeLists.txt +++ b/grpc/CMakeLists.txt @@ -1,36 +1,15 @@ -SET(USE_SYSTEM_GRPC ON CACHE BOOL "Use system installed GRPC if available") SET(ABSL_PROPAGATE_CXX_STD ON) SET(protobuf_MODULE_COMPATIBLE TRUE) -IF(USE_SYSTEM_GRPC) - FIND_PACKAGE(Protobuf CONFIG) - FIND_PACKAGE(gRPC CONFIG) -ENDIF() +FIND_PACKAGE(Protobuf CONFIG REQUIRED) +FIND_PACKAGE(gRPC CONFIG REQUIRED) -IF (gRPC_FOUND) - MESSAGE(STATUS "Using preinstalled protobuf ${Protobuf_VERSION}") - MESSAGE(STATUS "Using preinstalled gRPC ${gRPC_VERSION}") - SET(_GRPC_GRPCPP gRPC::grpc++) - SET(_PROTOBUF_PROTOC $) - SET(_GRPC_CPP_PLUGIN_EXECUTABLE $) - SET(_GRPC_PYTHON_PLUGIN_EXECUTABLE $) -ELSE() - INCLUDE(FetchContent) - - FetchContent_Declare( - gRPC - GIT_REPOSITORY https://github.com/grpc/grpc - GIT_TAG v1.53.0 - ) - SET(FETCHCONTENT_QUIET OFF) - SET(gRPC_ZLIB_PROVIDER "package") - SET(gRPC_INSTALL OFF) - FetchContent_MakeAvailable(gRPC) - SET(_PROTOBUF_PROTOC $) - SET(_GRPC_CPP_PLUGIN_EXECUTABLE $) - SET(_GRPC_PYTHON_PLUGIN_EXECUTABLE $) - SET(_GRPC_GRPCPP grpc++) -ENDIF() +MESSAGE(STATUS "Using preinstalled protobuf ${Protobuf_VERSION}") +MESSAGE(STATUS "Using preinstalled gRPC ${gRPC_VERSION}") +SET(_GRPC_GRPCPP gRPC::grpc++) +SET(_PROTOBUF_PROTOC $) +SET(_GRPC_CPP_PLUGIN_EXECUTABLE $) +SET(_GRPC_PYTHON_PLUGIN_EXECUTABLE $) SET(rg_proto "jfjoch.proto") SET(rg_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/jfjoch.pb.cc")