diff options
| author | Victor Romero <viromer@microsoft.com> | 2019-01-10 09:54:02 -0800 |
|---|---|---|
| committer | Victor Romero <viromer@microsoft.com> | 2019-01-10 09:54:02 -0800 |
| commit | f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af (patch) | |
| tree | 652e6b64bb2e47ac124fd4b73e97cea2e92abbeb /ports/google-cloud-cpp | |
| parent | 67ca08e9d3d0fb8097da84bc593a805f7169095f (diff) | |
| parent | 7578a485b181ded330b87cc72726f01e38ff7ed6 (diff) | |
| download | vcpkg-f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af.tar.gz vcpkg-f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/viromer/5019
Diffstat (limited to 'ports/google-cloud-cpp')
| -rw-r--r-- | ports/google-cloud-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/include-protobuf.patch | 13 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/portfile.cmake | 14 |
3 files changed, 6 insertions, 23 deletions
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 5689f78bb..8be4a8c33 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp
-Version: 0.4.0
+Version: 0.5.0
Build-Depends: grpc, gtest, curl, crc32c
Description: C++ Client Libraries for Google Cloud Platform APIs.
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) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 54fa6d483..94e227c4f 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -1,17 +1,13 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.4.0 - SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a + REF v0.5.0 + SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5 HEAD_REF master - PATCHES include-protobuf.patch ) set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97) @@ -29,7 +25,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=vcpkg + -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF ) |