This is an archive of the discontinued LLVM Phabricator instance.

Differential D90030

[CMake] Fix hardcoding of protobuf output basename. NFC
ClosedPublic

Authored by sammccall on Oct 23 2020, 5:06 AM.

Details

Reviewers
kbobyrev
Commits
rG2d25004a1372: [CMake] Fix hardcoding of protobuf output basename. NFC

Diff Detail

Event Timeline

sammccall created this revision.Oct 23 2020, 5:06 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 23 2020, 5:06 AM
Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript
sammccall requested review of this revision.Oct 23 2020, 5:06 AM
Harbormaster completed remote builds in B76165: Diff 300238.Oct 23 2020, 5:09 AM
kbobyrev accepted this revision.Oct 23 2020, 5:24 AM

LGTM, thanks!

This revision is now accepted and ready to land.Oct 23 2020, 5:24 AM
This revision was landed with ongoing or failed builds.Oct 23 2020, 5:30 AM
Closed by commit rG2d25004a1372: [CMake] Fix hardcoding of protobuf output basename. NFC (authored by sammccall). · Explain Why
This revision was automatically updated to reflect the committed changes.
sammccall added a commit: rG2d25004a1372: [CMake] Fix hardcoding of protobuf output basename. NFC.

Revision Contents

PathSize
llvm/
cmake/
modules/
9 lines

Diff 300250

llvm/cmake/modules/FindGRPC.cmake

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
# Proto headers are generated in ${CMAKE_CURRENT_BINARY_DIR}. # Proto headers are generated in ${CMAKE_CURRENT_BINARY_DIR}.
# Libraries that use these headers should adjust the include path. # Libraries that use these headers should adjust the include path.
# If the "GRPC" argument is given, services are also generated. # If the "GRPC" argument is given, services are also generated.
function(generate_protos LibraryName ProtoFile) function(generate_protos LibraryName ProtoFile)
cmake_parse_arguments(PARSE_ARGV 2 PROTO "GRPC" "" "") cmake_parse_arguments(PARSE_ARGV 2 PROTO "GRPC" "" "")
get_filename_component(ProtoSourceAbsolutePath "${CMAKE_CURRENT_SOURCE_DIR}/${ProtoFile}" ABSOLUTE) get_filename_component(ProtoSourceAbsolutePath "${CMAKE_CURRENT_SOURCE_DIR}/${ProtoFile}" ABSOLUTE)
get_filename_component(ProtoSourcePath ${ProtoSourceAbsolutePath} PATH) get_filename_component(ProtoSourcePath ${ProtoSourceAbsolutePath} PATH)
get_filename_component(Basename ${ProtoSourceAbsolutePath} NAME_WLE)
set(GeneratedProtoSource "${CMAKE_CURRENT_BINARY_DIR}/Index.pb.cc") set(GeneratedProtoSource "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.pb.cc")
set(GeneratedProtoHeader "${CMAKE_CURRENT_BINARY_DIR}/Index.pb.h") set(GeneratedProtoHeader "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.pb.h")
set(Flags set(Flags
--cpp_out="${CMAKE_CURRENT_BINARY_DIR}" --cpp_out="${CMAKE_CURRENT_BINARY_DIR}"
--proto_path="${ProtoSourcePath}") --proto_path="${ProtoSourcePath}")
if (PROTO_GRPC) if (PROTO_GRPC)
list(APPEND Flags list(APPEND Flags
--grpc_out="${CMAKE_CURRENT_BINARY_DIR}" --grpc_out="${CMAKE_CURRENT_BINARY_DIR}"
--plugin=protoc-gen-grpc="${GRPC_CPP_PLUGIN}") --plugin=protoc-gen-grpc="${GRPC_CPP_PLUGIN}")
list(APPEND GeneratedProtoSource "${CMAKE_CURRENT_BINARY_DIR}/Index.grpc.pb.cc") list(APPEND GeneratedProtoSource "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.grpc.pb.cc")
list(APPEND GeneratedProtoHeader "${CMAKE_CURRENT_BINARY_DIR}/Index.grpc.pb.h") list(APPEND GeneratedProtoHeader "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.grpc.pb.h")
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${GeneratedProtoSource} ${GeneratedProtoHeader} OUTPUT ${GeneratedProtoSource} ${GeneratedProtoHeader}
COMMAND ${PROTOC} COMMAND ${PROTOC}
ARGS ${Flags} "${ProtoSourceAbsolutePath}" ARGS ${Flags} "${ProtoSourceAbsolutePath}"
DEPENDS "${ProtoSourceAbsolutePath}") DEPENDS "${ProtoSourceAbsolutePath}")
add_clang_library(${LibraryName} ${GeneratedProtoSource} add_clang_library(${LibraryName} ${GeneratedProtoSource}
PARTIAL_SOURCES_INTENDED PARTIAL_SOURCES_INTENDED
LINK_LIBS grpc++ protobuf) LINK_LIBS grpc++ protobuf)
endfunction() endfunction()