diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
| commit | 773c8267dfb506f41c204f61042f30b6143a8095 (patch) | |
| tree | 5946d1526c3ad77a2df80786a1370d96389d931b /ports/google-cloud-cpp/include-protobuf.patch | |
| parent | 6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff) | |
| parent | 7859944528be28bee1fda9f325b78d6a7f02124e (diff) | |
| download | vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
Diffstat (limited to 'ports/google-cloud-cpp/include-protobuf.patch')
| -rw-r--r-- | ports/google-cloud-cpp/include-protobuf.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch deleted file mode 100644 index 63602ad72..000000000 --- a/ports/google-cloud-cpp/include-protobuf.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 ()
|