Skip to content

Commit

Permalink
[google-cloud-cpp] update to the latest release (v2.21.0) (microsoft#…
Browse files Browse the repository at this point in the history
…36522)

* [google-cloud-cpp] update to the latest release (v2.21.0)

* rerun version thingy

* rerun version thingy again
  • Loading branch information
dbolduc authored Feb 2, 2024
1 parent f9a5556 commit 8040303
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 20 deletions.
31 changes: 15 additions & 16 deletions ports/google-cloud-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO googleapis/google-cloud-cpp
REF "v${VERSION}"
SHA512 f017252b3fbccd5b91088a00c98a610606c5e98b920bf6c0889b6bf0f33f923c38a6116df7d9784381fd6b81ff4c303f55a609fde2e7182958a3c9cbab1f9f47
SHA512 f02e26964a4049791bf4ce9580e738f245fb8380f9a1ccf3bd193296a4877aece72e8507efbbcabf7ef7072a810f6632c399748d804e33f3cc769ef49e334a88
HEAD_REF main
PATCHES
support_absl_cxx17.patch
Expand Down Expand Up @@ -53,28 +53,27 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
foreach(feature IN LISTS FEATURES)
set(config_path "lib/cmake/google_cloud_cpp_${feature}")
# Most features get their own package in `google-cloud-cpp`.
# The exceptions are captured by this `if()` command, basically
# things like `core` and `experimental-storage-grpc` are skipped.

function (google_cloud_cpp_cmake_config_fixup library)
set(config_path "lib/cmake/google_cloud_cpp_${library}")
# If the library exists and is installed, tell vcpkg about it.
if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
continue()
return()
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}"
vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${library}"
CONFIG_PATH "${config_path}"
DO_NOT_DELETE_PARENT_CONFIG_PATH)
endfunction ()

foreach(feature IN LISTS GOOGLE_CLOUD_CPP_ENABLE)
google_cloud_cpp_cmake_config_fixup(${feature})
google_cloud_cpp_cmake_config_fixup(${feature}_mocks)
endforeach()

# These packages are automatically installed depending on what features are
# enabled.
foreach(suffix common compute_protos googleapis grpc_utils iam_v2 logging_type rest_internal rest_protobuf_internal dialogflow_cx dialogflow_es)
set(config_path "lib/cmake/google_cloud_cpp_${suffix}")
if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
continue()
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}"
CONFIG_PATH "${config_path}"
DO_NOT_DELETE_PARENT_CONFIG_PATH)
foreach(feature common compute_protos googleapis grpc_utils iam_v2 logging_type rest_internal rest_protobuf_internal)
google_cloud_cpp_cmake_config_fixup(${feature})
endforeach()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
Expand Down
15 changes: 13 additions & 2 deletions ports/google-cloud-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "google-cloud-cpp",
"version": "2.20.0",
"port-version": 1,
"version": "2.21.0",
"description": "C++ Client Libraries for Google Cloud Platform APIs.",
"homepage": "https://github.com/googleapis/google-cloud-cpp",
"license": "Apache-2.0",
Expand Down Expand Up @@ -1205,6 +1204,18 @@
}
]
},
"servicehealth": {
"description": "Personalized Service Health API C++ Client Library",
"dependencies": [
{
"name": "google-cloud-cpp",
"default-features": false,
"features": [
"grpc-common"
]
}
]
},
"servicemanagement": {
"description": "Service Management API C++ Client Library",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3081,8 +3081,8 @@
"port-version": 7
},
"google-cloud-cpp": {
"baseline": "2.20.0",
"port-version": 1
"baseline": "2.21.0",
"port-version": 0
},
"google-cloud-cpp-common": {
"baseline": "alias",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/google-cloud-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d8f3be8b308c4858ec0226b7aebe1e55a21298f4",
"version": "2.21.0",
"port-version": 0
},
{
"git-tree": "363eb6725f35aaefdbd1da17ab0a3d1bd93e90cd",
"version": "2.20.0",
Expand Down

0 comments on commit 8040303

Please sign in to comment.