From 751fc199af8d33eb300af5edbd9e3b77c48f0bca Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 4 Jun 2021 19:50:36 -0400 Subject: [google-cloud-cpp] update to latest (v1.28.0) version (#18246) * [google-cloud-cpp] update to latest (v1.28.0) version * Address review comments * Revert "Address review comments" This reverts commit db47320dda0d15a02d9fc4e177f4ee355a5991b5. --- ports/google-cloud-cpp/disable-benchmarks.patch | 43 ------------------------- ports/google-cloud-cpp/portfile.cmake | 7 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 ports/google-cloud-cpp/disable-benchmarks.patch (limited to 'ports/google-cloud-cpp') diff --git a/ports/google-cloud-cpp/disable-benchmarks.patch b/ports/google-cloud-cpp/disable-benchmarks.patch deleted file mode 100644 index 966cb1733..000000000 --- a/ports/google-cloud-cpp/disable-benchmarks.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt -index d68ae2a..99ec4c2 100644 ---- a/generator/CMakeLists.txt -+++ b/generator/CMakeLists.txt -@@ -150,7 +150,7 @@ function (google_cloud_cpp_generator_define_tests) - endforeach () - endfunction () - --add_subdirectory(integration_tests) -+# add_subdirectory(integration_tests) - - # Only define the tests if testing is enabled. Package maintainers may not want - # to build all the tests everytime they create a new package or when the package -diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt -index 09a4b58..9c85374 100644 ---- a/google/cloud/CMakeLists.txt -+++ b/google/cloud/CMakeLists.txt -@@ -548,5 +548,5 @@ if (GOOGLE_CLOUD_CPP_ENABLE_GRPC) - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_grpc_utils" - COMPONENT google_cloud_cpp_development) - -- add_subdirectory(samples) -+ #add_subdirectory(samples) - endif () -diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt -index 399c84f..d58c910 100644 ---- a/google/cloud/bigtable/CMakeLists.txt -+++ b/google/cloud/bigtable/CMakeLists.txt -@@ -323,12 +323,12 @@ if (BUILD_TESTING) - add_subdirectory(tests) - endif () - --add_subdirectory(benchmarks) -+# add_subdirectory(benchmarks) - - if (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS) - # The examples are more readable if we use exceptions for error handling. We - # had to tradeoff readability vs. "making them compile everywhere". -- add_subdirectory(examples) -+ #add_subdirectory(examples) - endif (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS) - - # Export the CMake targets to make it easy to create configuration files. diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 98acc2302..6c3378c2f 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.27.0 - SHA512 8528dbdea21a1ca84b7e3b7768a6f6de42c86ed879a4332e646b6de382bf8012d832a2687d5c4560530b569fd79983c259c49852855422c798a63e1787cda328 + REF v1.28.0 + SHA512 066655495d9d1a5a183b3efb682daf5b97e6f76943c7f6075694386075b9e8efacd102927e2e265bd4b509317088b4af70584695648e598b2a21d0df4111a6b6 HEAD_REF master - PATCHES - disable-benchmarks.patch ) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") @@ -22,6 +20,7 @@ vcpkg_configure_cmake( -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF -DBUILD_TESTING=OFF ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 253b98705..bd486a045 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.27.0", + "version": "1.28.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", -- cgit v1.2.3