diff --git a/bin_test_grpc/CMakeLists.txt b/bin_test_grpc/CMakeLists.txt index 14b7b35..3f1268c 100644 --- a/bin_test_grpc/CMakeLists.txt +++ b/bin_test_grpc/CMakeLists.txt @@ -15,7 +15,7 @@ include(../cmake-linux/grpc.cmake) message(${BoldGreen} GRPC_LIBRARY_DIR:${GRPC_LIBRARY_DIR} \n GRPC_INCLUDE_DIR:${GRPC_INCLUDE_DIR} \n - PROTOBUF_INCLUDE_DIR:${PROTOBUF_INCLUDE_DIR} \n + GRPC_BINARY_DIR:${GRPC_BINARY_DIR} \n grpc_cpp_plugin:${GRPC_BINARY_DIR}/grpc_cpp_plugin${ColourReset}) set(PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -29,7 +29,7 @@ add_custom_command( ARGS --grpc_out "${PROTO_DIR}" --cpp_out "${PROTO_DIR}" -I "${PROTO_DIR}" - --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN_EXECUTABLE} + --plugin=protoc-gen-grpc=${GRPC_BINARY_DIR}/grpc_cpp_plugin helloworld.proto) add_library(hello_proto diff --git a/cmake-linux/grpc.cmake b/cmake-linux/grpc.cmake index 51884b0..ddc4cd5 100644 --- a/cmake-linux/grpc.cmake +++ b/cmake-linux/grpc.cmake @@ -38,7 +38,6 @@ list(APPEND CMAKE_PREFIX_PATH "${GRPC_ROOT}/lib/cmake/grpc/") find_package(gRPC CONFIG REQUIRED) message("${BoldGreen}Using gRPC-cpp ${gRPC_VERSION}${ColourReset}") - find_path(GRPC_BINARY_DIR grpc_cpp_plugin PATHS ${GRPC_ROOT}/bin) find_path(GRPC_LIBRARY_DIR cmake/grpc/gRPCConfig.cmake PATHS ${GRPC_ROOT}/lib) find_path(GRPC_INCLUDE_DIR grpc/grpc.h PATHS ${_GRPC_INCLUDE_DIR} ) @@ -48,9 +47,9 @@ mark_as_advanced( GRPC_INCLUDE_DIR ) message("${BoldGreen}GRPC_INCLUDE_DIR is ${GRPC_INCLUDE_DIR}${ColourReset}") -set(PROTOBUF_LIBPROTOBUF $) +set(PROTOBUF_LIBPROTOBUF $) set(PROTOBUF_PROTOC $) -find_program(GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) +set(GRPC_CPP_PLUGIN_EXECUTABLE gRPC::grpc_cpp_plugin) set(REFLECTION gRPC::grpc++_reflection) set(GRPC_GRPCPP gRPC::grpc++) include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)