diff options
| author | Jozef Izso <jozef.izso@gmail.com> | 2018-04-26 15:23:44 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-17 16:09:11 -0700 |
| commit | c95b6bfdc448295b66da22cfd35d34ed8302aa4d (patch) | |
| tree | 882723e7e7ffeb9259daf70c1502aee562b3febb /ports/google-cloud-cpp/include-protobuf.patch | |
| parent | a1f0dcd02beb364e7f3f99a784229b64d161b234 (diff) | |
| download | vcpkg-c95b6bfdc448295b66da22cfd35d34ed8302aa4d.tar.gz vcpkg-c95b6bfdc448295b66da22cfd35d34ed8302aa4d.zip | |
[grpc] Update to v1.12.0 [protobuf] Update to v3.6.0.1
Diffstat (limited to 'ports/google-cloud-cpp/include-protobuf.patch')
| -rw-r--r-- | ports/google-cloud-cpp/include-protobuf.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch new file mode 100644 index 000000000..63602ad72 --- /dev/null +++ b/ports/google-cloud-cpp/include-protobuf.patch @@ -0,0 +1,24 @@ +diff --git a/bigtable/CMakeLists.txt b/bigtable/CMakeLists.txt
+index 1b8089f..771e1ec 100644
+--- a/bigtable/CMakeLists.txt
++++ b/bigtable/CMakeLists.txt
+@@ -69,6 +69,10 @@ set(PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" "${PROJECT_SOUR
+ if(GRPC_ROOT_DIR)
+ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${GRPC_ROOT_DIR}/third_party/protobuf/src")
+ endif(GRPC_ROOT_DIR)
++find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto)
++if(PROTO_INCLUDE_DIR)
++ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
++endif()
+
+ # Get the destination directories based on the GNU recommendations.
+ include(GNUInstallDirs)
+@@ -110,7 +114,7 @@ enable_testing()
+
+ # Capture the compiler version and the git revision into variables, then
+ # generate a config file with the values.
+-if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)
++if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git AND 0)
+ execute_process(COMMAND git rev-parse --short HEAD
+ OUTPUT_VARIABLE GIT_HEAD_LOG ERROR_VARIABLE GIT_HEAD_LOG)
+ else ()
|