From df518b80c8c2cf8cb2e1ccd25b6309373e901044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Sch=C3=BCtte?= Date: Fri, 2 Feb 2018 21:04:34 +0100 Subject: [PATCH] Remove gRPC proto compiler invocation from CMakeLists.txt (#878) --- CMakeLists.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55e9adc..03f5236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,6 @@ set(CARTOGRAPHER_PATCH_VERSION 0) set(CARTOGRAPHER_VERSION ${CARTOGRAPHER_MAJOR_VERSION}.${CARTOGRAPHER_MINOR_VERSION}.${CARTOGRAPHER_PATCH_VERSION}) set(CARTOGRAPHER_SOVERSION ${CARTOGRAPHER_MAJOR_VERSION}.${CARTOGRAPHER_MINOR_VERSION}) option(BUILD_GRPC "build Cartographer gRPC support" false) -# TODO(gaschler): Make this an option. -set(GRPC_PLUGIN_PATH "/usr/local/bin/grpc_cpp_plugin") include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake") google_initialize_cartographer_project() @@ -115,20 +113,16 @@ if(${BUILD_GRPC}) list(APPEND ALL_GRPC_SERVICE_SRCS "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.pb.cc") list(APPEND ALL_GRPC_SERVICE_HDRS "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.pb.h") - list(APPEND ALL_GRPC_SERVICE_SRCS "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.grpc.pb.cc") - list(APPEND ALL_GRPC_SERVICE_HDRS "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.grpc.pb.h") add_custom_command( - OUTPUT "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.grpc.pb.cc" - "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.grpc.pb.h" + OUTPUT "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.pb.cc" + "${PROJECT_BINARY_DIR}/${DIR}/${FIL_WE}.pb.h" COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} - ARGS --grpc_out ${PROJECT_BINARY_DIR} - --cpp_out ${PROJECT_BINARY_DIR} + ARGS --cpp_out ${PROJECT_BINARY_DIR} -I ${PROJECT_SOURCE_DIR} - --plugin=protoc-gen-grpc=${GRPC_PLUGIN_PATH} ${ABS_FIL} DEPENDS ${ABS_FIL} - COMMENT "Running C++ protocol buffer compiler with gRPC support on ${ABS_FIL}" + COMMENT "Running C++ protocol buffer compiler on ${ABS_FIL}" VERBATIM ) endforeach()