From ee1e12048e007f7247bd27622b13803c7a124bb1 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 1 Oct 2021 19:59:54 -0400 Subject: [PATCH] [google-cloud-cpp] update to latest release (v1.32.0) (#20463) * [google-cloud-cpp] update to latest release (v1.32.0) * Update from deprecated vcpkg functions * Undo migration to `vcpkg_cmake_config_fixup()` I could not get this to work. I will ask in the discord channel because I must be using it wrong. --- ports/google-cloud-cpp/portfile.cmake | 11 +++++------ ports/google-cloud-cpp/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 22a0829e57..06ff7860a6 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,9 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.31.1 - SHA512 c172280cc934978505524d53bc804dc9079af21a1357f347b0bd3554d25cc2d57dec3869f1ba01f9eacaa1367feede84ae158fa3e9039b0e6bb87f7c27717bb1 - HEAD_REF master + REF v1.32.0 + SHA512 ffec5a4f76fc4232f15940afea137c38f12e395d0b04cf49838e53f04ba28c151c05470191dc9648b5ae9be5bdcc5b449379b3dbb51552917625a9a87b97c8e2 + HEAD_REF main ) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") @@ -16,9 +16,8 @@ set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" @@ -29,7 +28,7 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 430fc44f41..35cbf153b0 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,12 +1,16 @@ { "name": "google-cloud-cpp", - "version": "1.31.1", + "version": "1.32.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ - "abseil" + "abseil", + { + "name": "vcpkg-cmake", + "host": true + } ], "default-features": [ "bigquery", diff --git a/versions/baseline.json b/versions/baseline.json index 238f0ce3d4..71ba3c2c1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2473,7 +2473,7 @@ "port-version": 7 }, "google-cloud-cpp": { - "baseline": "1.31.1", + "baseline": "1.32.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index b2a8c9989a..ea0a234d27 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d138daefe227de160954ecdce23178fa659edb36", + "version": "1.32.0", + "port-version": 0 + }, { "git-tree": "64af5624931918b1df7ff30a2f44ef86104739cd", "version": "1.31.1",