From aace39dc14a1d6dd4cac74b2c4c991241fcc35c8 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 11 Dec 2018 22:22:53 -0500 Subject: Upgrade google-cloud-cpp to v0.4.0 Just a periodic release. --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ports/google-cloud-cpp') diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 7a64d2e14..5689f78bb 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.3.0-1 +Version: 0.4.0 Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 2081b20f7..54fa6d483 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -8,8 +8,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.3.0 - SHA512 90f876ebf4bea40c5bc12d2bd20d27b48202f951d57a68b657c07b7d468b2ac5a00e39a3a6fca48f92030d89ba7d9706eb52b3c8e734b392aee63632af042b5d + REF v0.4.0 + SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a HEAD_REF master PATCHES include-protobuf.patch ) -- cgit v1.2.3 From 75675059bfdaf3ca197ce78d881d4968a5da5877 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 8 Jan 2019 15:42:41 -0500 Subject: Upgrade google-cloud-cpp to v0.5.0. (#5096) This time with less patches! --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/include-protobuf.patch | 13 ------------- ports/google-cloud-cpp/portfile.cmake | 14 +++++--------- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 ports/google-cloud-cpp/include-protobuf.patch (limited to 'ports/google-cloud-cpp') 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 ) -- cgit v1.2.3 From 0151644a6bb67c916fd0340e78fad3dbd2ec423c Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 12 Feb 2019 20:01:15 -0500 Subject: Upgrade google-cloud-cpp to 0.6.0. (#5367) In this version we can disable the unit and integration tests, though it still tries to find `googletest` so we cannot remove the dependency just yet. --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ports/google-cloud-cpp') diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 8be4a8c33..195d3d6f5 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.5.0 +Version: 0.6.0 Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 94e227c4f..0f8b14d84 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -27,6 +27,7 @@ vcpkg_configure_cmake( OPTIONS -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) -- cgit v1.2.3