blob: d479a82b1e30eba9a1e0bdcf4aac69befed5e110 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
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
|
