diff options
| author | Aybe <aybe@users.noreply.github.com> | 2018-08-08 21:15:47 +0200 |
|---|---|---|
| committer | Aybe <aybe@users.noreply.github.com> | 2018-08-08 21:15:47 +0200 |
| commit | 61820777517d669e00fbdeb2368e156b66396b51 (patch) | |
| tree | 57e0d31ff7b8fc3f85fd3bfe98148ef715149b6c /ports/google-cloud-cpp/include-protobuf.patch | |
| parent | 8cfc78e890b18762f1f5d0aff346c397de2e6d56 (diff) | |
| parent | 13e19f10ea83985708320542cbf05217b4da9969 (diff) | |
| download | vcpkg-61820777517d669e00fbdeb2368e156b66396b51.tar.gz vcpkg-61820777517d669e00fbdeb2368e156b66396b51.zip | |
Merge branch 'master' into liblzma-uwp
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 ()
|