diff options
Diffstat (limited to 'net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch')
| -rw-r--r-- | net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch new file mode 100644 index 000000000000..d479a82b1e30 --- /dev/null +++ b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch @@ -0,0 +1,33 @@ +From eb0155e90498a5d7341490b9ed123f7638bffe44 Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Fri, 7 Sep 2018 21:19:11 +0800 +Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config + +The grpc_cpp_plugin executable needs to be marked imported otherwise +cmake will try (and fail) to build it. +Also the location variable was typo'd. + +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + cmake/IncludeGrpc.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake +index 14273cbb..929f984d 100644 +--- a/cmake/IncludeGrpc.cmake ++++ b/cmake/IncludeGrpc.cmake +@@ -231,9 +231,9 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config") + ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release + ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) + mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE) +- add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE}) ++ add_executable(grpc_cpp_plugin IMPORTED) + set_property(TARGET grpc_cpp_plugin + PROPERTY IMPORTED_LOCATION +- ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE}) ++ ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE}) + + endif () +-- +2.16.4 + |