From 82c2a4266d4fc11c6828326c94015df46c099dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=99=93=E5=BC=BA?= Date: Sat, 18 Sep 2021 17:53:03 +0800 Subject: [PATCH 1/3] Update opentelemetry-proto.cmake --- cmake/opentelemetry-proto.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake index 36f389301b..cecc0930c5 100644 --- a/cmake/opentelemetry-proto.cmake +++ b/cmake/opentelemetry-proto.cmake @@ -84,7 +84,12 @@ foreach(IMPORT_DIR ${PROTOBUF_IMPORT_DIRS}) list(APPEND PROTOBUF_INCLUDE_FLAGS "-I${IMPORT_DIR}") endforeach() -set(gRPC_CPP_PLUGIN_EXECUTABLE $) + +if(CMAKE_CROSSCOMPILING) + find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) +else() + set(gRPC_CPP_PLUGIN_EXECUTABLE $) +endif() add_custom_command( OUTPUT ${COMMON_PB_H_FILE} From 7e9b4d9ae103b67f023bcd42e944667d7f364c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=99=93=E5=BC=BA?= Date: Wed, 22 Sep 2021 09:11:14 +0800 Subject: [PATCH 2/3] Update opentelemetry-proto.cmake add miss grpc:: --- cmake/opentelemetry-proto.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake index cecc0930c5..6204349c44 100644 --- a/cmake/opentelemetry-proto.cmake +++ b/cmake/opentelemetry-proto.cmake @@ -88,7 +88,7 @@ endforeach() if(CMAKE_CROSSCOMPILING) find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) else() - set(gRPC_CPP_PLUGIN_EXECUTABLE $) + set(gRPC_CPP_PLUGIN_EXECUTABLE $) endif() add_custom_command( From ad215646b9eec342d349f8a00c4332668e7bdbf4 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 21 Sep 2021 20:20:29 -0700 Subject: [PATCH 3/3] Fix casing of gRPC --- cmake/opentelemetry-proto.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake index 6204349c44..9fb6f49886 100644 --- a/cmake/opentelemetry-proto.cmake +++ b/cmake/opentelemetry-proto.cmake @@ -88,7 +88,7 @@ endforeach() if(CMAKE_CROSSCOMPILING) find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) else() - set(gRPC_CPP_PLUGIN_EXECUTABLE $) + set(gRPC_CPP_PLUGIN_EXECUTABLE $) endif() add_custom_command(