From 0e7413938a109285e41f3a55650c6a338279c355 Mon Sep 17 00:00:00 2001 From: Xi Chen Date: Tue, 27 Mar 2018 14:32:42 -0700 Subject: [PATCH 1/4] added missing *.pb.h *.pb.cc generation to fix distribute build issue --- cmake/generic.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index c749c97f13649..c0808ac06cc78 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -597,6 +597,9 @@ function(grpc_library TARGET_NAME) COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}" -I "${PROTO_PATH}" --plugin=protoc-gen-grpc="${GRPC_CPP_PLUGIN}" "${ABS_PROTO}" + COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} + ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}" -I "${PROTO_PATH}" + "${ABS_PROTO}" DEPENDS "${ABS_PROTO}" ${PROTOBUF_PROTOC_EXECUTABLE} extern_grpc) # FIXME(typhoonzero): grpc generated code do not generate virtual-dtor, mark it From d4f49355309f257f33ce08c4d680c712ee5cf2a0 Mon Sep 17 00:00:00 2001 From: Xi Chen Date: Tue, 27 Mar 2018 18:56:04 -0700 Subject: [PATCH 2/4] test removal of redundant line --- cmake/generic.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index c0808ac06cc78..981da16a459c1 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -587,7 +587,6 @@ function(grpc_library TARGET_NAME) get_filename_component(PROTO_WE ${grpc_library_PROTO} NAME_WE) get_filename_component(PROTO_PATH ${ABS_PROTO} PATH) - protobuf_generate_cpp(grpc_proto_srcs grpc_proto_hdrs "${ABS_PROTO}") set(grpc_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.cc") set(grpc_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.h") cc_library("${TARGET_NAME}_proto" SRCS "${grpc_proto_srcs}") From 06aaea8a64c59467d45f2cf2e4eea3d0e91d946a Mon Sep 17 00:00:00 2001 From: Xi Chen Date: Tue, 27 Mar 2018 19:10:04 -0700 Subject: [PATCH 3/4] Revert "test removal of redundant line" This reverts commit d4f49355309f257f33ce08c4d680c712ee5cf2a0. --- cmake/generic.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 981da16a459c1..c0808ac06cc78 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -587,6 +587,7 @@ function(grpc_library TARGET_NAME) get_filename_component(PROTO_WE ${grpc_library_PROTO} NAME_WE) get_filename_component(PROTO_PATH ${ABS_PROTO} PATH) + protobuf_generate_cpp(grpc_proto_srcs grpc_proto_hdrs "${ABS_PROTO}") set(grpc_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.cc") set(grpc_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.h") cc_library("${TARGET_NAME}_proto" SRCS "${grpc_proto_srcs}") From 1daa96579cd5df393b8f848c72ea9974a8d25b62 Mon Sep 17 00:00:00 2001 From: Xi Chen Date: Tue, 27 Mar 2018 20:14:34 -0700 Subject: [PATCH 4/4] adding comments for this fix --- cmake/generic.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index c0808ac06cc78..3fe750f47efc1 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -587,6 +587,9 @@ function(grpc_library TARGET_NAME) get_filename_component(PROTO_WE ${grpc_library_PROTO} NAME_WE) get_filename_component(PROTO_PATH ${ABS_PROTO} PATH) + #FIXME(putcn): the follwoing line is supposed to generate *.pb.h and cc, but + # somehow it didn't. line 602 to 604 is to patching this. Leaving this here + # for now to enable dist CI. protobuf_generate_cpp(grpc_proto_srcs grpc_proto_hdrs "${ABS_PROTO}") set(grpc_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.cc") set(grpc_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.h")