diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
| commit | 57c78037a4a8f0f7384504475c5510984657f0d2 (patch) | |
| tree | 91928048e7001ea224d68da54d9bb43cbbd7970f /ports/google-cloud-cpp/include-protobuf.patch | |
| parent | bf4a864a73dfe0f68a70598c9f5087beca57f2c7 (diff) | |
| parent | 1134de5eacf2052a936a943acea7f08ba06462d7 (diff) | |
| download | vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.tar.gz vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.zip | |
Merge branch 'master' into dev/philc/4990
Diffstat (limited to 'ports/google-cloud-cpp/include-protobuf.patch')
| -rw-r--r-- | ports/google-cloud-cpp/include-protobuf.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch deleted file mode 100644 index d0e3529c7..000000000 --- a/ports/google-cloud-cpp/include-protobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:56:34.029389338 -0500 -+++ a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:57:18.461259917 -0500 -@@ -53,6 +53,10 @@ - # Configure the location of proto files, particulary the googleapis protos. - list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" - "${PROJECT_SOURCE_DIR}") -+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto) -+if(PROTO_INCLUDE_DIR) -+ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}") -+endif() - - # Include the functions to compile proto files. - include(CompileProtos) |