From 0a1d0f84f7ce0ea3432fa6d928a2137b43861d45 Mon Sep 17 00:00:00 2001
From: Carlos O'Ryan <coryan@google.com>
Date: Thu, 14 Oct 2021 21:08:50 -0400
Subject: [PATCH] [google-cloud-cpp] fix backwards compatibility package files
 (#20723)

---
 ports/google-cloud-cpp/portfile.cmake | 4 ++--
 ports/google-cloud-cpp/vcpkg.json     | 1 +
 versions/baseline.json                | 2 +-
 versions/g-/google-cloud-cpp.json     | 5 +++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index b8e1012afe..08caef6dd6 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 1ef1ea448a..b88bfe428d 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 7bd7b5cbfe..af499edca8 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 2728635df3..722c9006d0 100644
--- a/versions/g-/google-cloud-cpp.json
+++ b/versions/g-/google-cloud-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "793c4f8aafbed21274611812020a3a4c01517fc2",
+      "version": "1.32.1",
+      "port-version": 1
+    },
     {
       "git-tree": "42240e5f4653d8ce17158c706e232de8a57a4c6e",
       "version": "1.32.1",