From d908a107b12c5b1fb4d1c3e08426d4d6139a9db1 Mon Sep 17 00:00:00 2001 From: Lorenzo Fontana Date: Thu, 12 Dec 2019 19:02:58 +0100 Subject: [PATCH] fix: allow gRPC to take protobuf from custom pkgconfig path Co-Authored-By: Leonardo Di Donato Signed-off-by: Lorenzo Fontana --- cmake/modules/FindGRPC.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/modules/FindGRPC.cmake b/cmake/modules/FindGRPC.cmake index ce472543..15e0ab48 100644 --- a/cmake/modules/FindGRPC.cmake +++ b/cmake/modules/FindGRPC.cmake @@ -15,6 +15,7 @@ option(BUILD_STATIC_GRPC "Build a static version of gRPC (useful for building in Operating Systems that don't have the gRPC package)" OFF) if(NOT BUILD_STATIC_GRPC) + # todo(fntlnz, leodido): check that gRPC version is greater or equal than 1.8.0 find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h) if(GRPCXX_INCLUDE) set(GRPC_INCLUDE ${GRPCXX_INCLUDE}) @@ -56,6 +57,7 @@ else() CONFIGURE_COMMAND "" BUILD_COMMAND CFLAGS=-Wno-implicit-fallthrough + PKG_CONFIG_PATH=${PROTOBUF_SRC} PKG_CONFIG=${PKG_CONFIG_EXECUTABLE} make grpc_cpp_plugin