Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generate and compile protobuf files for the new log protocol to commu… #8889

Merged
merged 1 commit into from Mar 25, 2019
Merged

Generate and compile protobuf files for the new log protocol to commu… #8889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions logd/src/logd/.gitignore
View file
Open in desktop
Expand Up @@ -5,3 +5,5 @@ config-logd.cpp
config-logd.h
core
logd
*.pb.h
*.pb.cc
11 changes: 11 additions & 0 deletions logd/src/logd/CMakeLists.txt
View file
Open in desktop
@@ -1,4 +1,14 @@
# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.

# logd is the only cpp module using the protobuf files for the log protocol.
# We have choosen to generate the cpp code where it is used, instead of changing the java logserver module to also generate and export cpp code just for this case.
# If more cpp modules requires the cpp protobuf files we should move code generation to a common place.
find_package(Protobuf REQUIRED)
protobuf_generate_cpp(logd_PROTOBUF_SRCS logd_PROTOBUF_HDRS ../../../logserver/src/protobuf/log_protocol.proto)

# protoc-generated files emit compiler warnings that we normally treat as errors.
set_source_files_properties(${logd_PROTOBUF_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-suggest-override")

vespa_add_library(logd STATIC
SOURCES
config_subscriber.cpp
Expand All @@ -7,6 +17,7 @@ vespa_add_library(logd STATIC
metrics.cpp
state_reporter.cpp
watcher.cpp
${logd_PROTOBUF_SRCS}

DEPENDS
)
Expand Down