aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Ryan <coryan@google.com>2021-10-14 21:08:50 -0400
committerGitHub <noreply@github.com>2021-10-14 18:08:50 -0700
commit0a1d0f84f7ce0ea3432fa6d928a2137b43861d45 (patch)
tree3919bb75a101662dc1ea85ccfe52661b670f100c
parent1ea8d69f882634cf780867bf714b991906f4dc2a (diff)
downloadvcpkg-0a1d0f84f7ce0ea3432fa6d928a2137b43861d45.tar.gz
vcpkg-0a1d0f84f7ce0ea3432fa6d928a2137b43861d45.zip
[google-cloud-cpp] fix backwards compatibility package files (#20723)
-rw-r--r--ports/google-cloud-cpp/portfile.cmake4
-rw-r--r--ports/google-cloud-cpp/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/g-/google-cloud-cpp.json5
4 files changed, 9 insertions, 3 deletions
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index b8e1012af..08caef6dd 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -63,8 +63,8 @@ foreach(package
pubsub_client
spanner_client
storage_client)
- set(config_path "lib/cmake/google_cloud_cpp_${suffix}")
- if(NOT IS_DIRECTORY "${config_path}")
+ set(config_path "lib/cmake/${package}")
+ if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
continue()
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}"
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
index 1ef1ea448..b88bfe428 100644
--- a/ports/google-cloud-cpp/vcpkg.json
+++ b/ports/google-cloud-cpp/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "google-cloud-cpp",
"version": "1.32.1",
+ "port-version": 1,
"description": "C++ Client Libraries for Google Cloud Platform APIs.",
"homepage": "https://github.com/googleapis/google-cloud-cpp",
"license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7bd7b5cbf..af499edca 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2482,7 +2482,7 @@
},
"google-cloud-cpp": {
"baseline": "1.32.1",
- "port-version": 0
+ "port-version": 1
},
"google-cloud-cpp-common": {
"baseline": "alias",
diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json
index 2728635df..722c9006d 100644
--- a/versions/g-/google-cloud-cpp.json
+++ b/versions/g-/google-cloud-cpp.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "793c4f8aafbed21274611812020a3a4c01517fc2",
+ "version": "1.32.1",
+ "port-version": 1
+ },
+ {
"git-tree": "42240e5f4653d8ce17158c706e232de8a57a4c6e",
"version": "1.32.1",
"port-version": 0