From 550ee0d8fcd6beaf533565fd06bbc42fe4258964 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Fri, 4 Oct 2019 10:25:21 +0000 Subject: [PATCH] build: compile version proto Signed-off-by: Leonardo Di Donato --- userspace/falco/CMakeLists.txt | 24 ++++++++++++++++++------ userspace/falco/config_falco.h.in | 2 -- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt index 6eb107ba..a3e78ae5 100644 --- a/userspace/falco/CMakeLists.txt +++ b/userspace/falco/CMakeLists.txt @@ -15,10 +15,22 @@ configure_file("${SYSDIG_SOURCE_DIR}/userspace/sysdig/config_sysdig.h.in" config add_custom_command( OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/output.grpc.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/output.grpc.pb.h - ${CMAKE_CURRENT_BINARY_DIR}/output.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/output.pb.h - ${CMAKE_CURRENT_BINARY_DIR}/schema.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/schema.pb.h - COMMENT "Generate gRPC code" + ${CMAKE_CURRENT_BINARY_DIR}/version.grpc.pb.cc + ${CMAKE_CURRENT_BINARY_DIR}/version.grpc.pb.h + ${CMAKE_CURRENT_BINARY_DIR}/version.pb.cc + ${CMAKE_CURRENT_BINARY_DIR}/version.pb.h + ${CMAKE_CURRENT_BINARY_DIR}/output.grpc.pb.cc + ${CMAKE_CURRENT_BINARY_DIR}/output.grpc.pb.h + ${CMAKE_CURRENT_BINARY_DIR}/output.pb.cc + ${CMAKE_CURRENT_BINARY_DIR}/output.pb.h + ${CMAKE_CURRENT_BINARY_DIR}/schema.pb.cc + ${CMAKE_CURRENT_BINARY_DIR}/schema.pb.h + COMMENT "Generate gRPC version API" + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/version.proto + COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --cpp_out=. ${CMAKE_CURRENT_SOURCE_DIR}/version.proto + COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} + ${CMAKE_CURRENT_SOURCE_DIR}/version.proto + COMMENT "Generate gRPC outputs API" DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/output.proto COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --cpp_out=. ${CMAKE_CURRENT_SOURCE_DIR}/output.proto ${CMAKE_CURRENT_SOURCE_DIR}/schema.proto @@ -40,12 +52,12 @@ add_executable( grpc_server_impl.cpp grpc_server.cpp utils.cpp + ${CMAKE_CURRENT_BINARY_DIR}/version.grpc.pb.cc + ${CMAKE_CURRENT_BINARY_DIR}/version.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/output.grpc.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/output.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/schema.pb.cc) -add_dependencies(falco civetweb) - if(USE_BUNDLED_DEPS) add_dependencies(falco yamlcpp) endif() diff --git a/userspace/falco/config_falco.h.in b/userspace/falco/config_falco.h.in index 85f95562..f15e487b 100644 --- a/userspace/falco/config_falco.h.in +++ b/userspace/falco/config_falco.h.in @@ -15,8 +15,6 @@ limitations under the License. */ #pragma once -#include -#include #define FALCO_VERSION "@FALCO_VERSION@" #define FALCO_VERSION_MAJOR "@FALCO_VERSION_MAJOR@"