Upgrade google-cloud-cpp to 0.9.0. (#6355)

3 files changed, 3 insertions, 148 deletions

diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 0f689c9e0..ca4078bf2 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp

-Version: 0.8.1-1

+Version: 0.9.0

 Build-Depends: grpc, curl[ssl], crc32c

 Description: C++ Client Libraries for Google Cloud Platform APIs.

diff --git a/ports/google-cloud-cpp/cmake-libcurl-target.patch b/ports/google-cloud-cpp/cmake-libcurl-target.patch
deleted file mode 100644
index 97e66e69f..000000000
--- a/ports/google-cloud-cpp/cmake-libcurl-target.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake
-index d3323e3b8..6ea7ca3e6 100644
---- a/cmake/IncludeCurl.cmake
-+++ b/cmake/IncludeCurl.cmake
-@@ -39,13 +39,13 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-     # stage/module/FindCURL.html for details).  Until then, define the target
-     # ourselves if it is missing.
-     find_package(CURL REQUIRED)
--    if (NOT TARGET CURL::CURL)
--        add_library(CURL::CURL UNKNOWN IMPORTED)
--        set_property(TARGET CURL::CURL
-+    if (NOT TARGET CURL::libcurl)
-+        add_library(CURL::libcurl UNKNOWN IMPORTED)
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                               "${CURL_INCLUDE_DIR}")
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
-     endif ()
-@@ -56,7 +56,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-     if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-         find_package(OpenSSL REQUIRED)
-         find_package(ZLIB REQUIRED)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES
-                               OpenSSL::SSL
-@@ -64,7 +64,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-                               ZLIB::ZLIB)
-         message(STATUS "CURL linkage will be static")
-         if (WIN32)
--            set_property(TARGET CURL::CURL
-+            set_property(TARGET CURL::libcurl
-                          APPEND
-                          PROPERTY INTERFACE_LINK_LIBRARIES
-                                   crypt32
-@@ -72,7 +72,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-                                   ws2_32)
-         endif ()
-         if (APPLE)
--            set_property(TARGET CURL::CURL
-+            set_property(TARGET CURL::libcurl
-                          APPEND
-                          PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-         endif ()
-diff --git a/cmake/external/curl.cmake b/cmake/external/curl.cmake
-index 54753ada9..2a83e19df 100644
---- a/cmake/external/curl.cmake
-+++ b/cmake/external/curl.cmake
-@@ -88,10 +88,10 @@ if (NOT TARGET curl_project)
-     endif ()
- 
-     include(ExternalProjectHelper)
--    add_library(CURL::CURL INTERFACE IMPORTED)
--    add_dependencies(CURL::CURL curl_project)
--    set_library_properties_for_external_project(CURL::CURL curl)
--    set_property(TARGET CURL::CURL
-+    add_library(CURL::libcurl INTERFACE IMPORTED)
-+    add_dependencies(CURL::libcurl curl_project)
-+    set_library_properties_for_external_project(CURL::libcurl curl)
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY INTERFACE_LINK_LIBRARIES
-                           c-ares::cares
-@@ -99,7 +99,7 @@ if (NOT TARGET curl_project)
-                           OpenSSL::Crypto
-                           ZLIB::ZLIB)
-     if (WIN32)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES
-                               crypt32
-@@ -107,7 +107,7 @@ if (NOT TARGET curl_project)
-                               ws2_32)
-     endif ()
-     if (APPLE)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-     endif ()
-diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
-index 1e750af8a..a0a04caab 100644
---- a/google/cloud/storage/CMakeLists.txt
-+++ b/google/cloud/storage/CMakeLists.txt
-@@ -226,7 +226,7 @@ target_link_libraries(storage_client
-                       PUBLIC google_cloud_cpp_common
-                              nlohmann_json
-                              Crc32c::crc32c
--                             CURL::CURL
-+                             CURL::libcurl
-                              Threads::Threads
-                              OpenSSL::SSL
-                              OpenSSL::Crypto
-@@ -396,7 +396,7 @@ if (BUILD_TESTING)
-                                           GTest::gmock_main
-                                           GTest::gmock
-                                           GTest::gtest
--                                          CURL::CURL
-+                                          CURL::libcurl
-                                           storage_common_options
-                                           nlohmann_json)
-             if (MSVC)
-diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in
-index 660829ae4..a4d261815 100644
---- a/google/cloud/storage/config.cmake.in
-+++ b/google/cloud/storage/config.cmake.in
-@@ -19,13 +19,13 @@ find_dependency(google_cloud_cpp_common)
- find_dependency(OpenSSL)
- find_dependency(ZLIB)
- 
--# Some versions of FindCURL do not define CURL::CURL, so we define it ourselves.
--if (NOT TARGET CURL::CURL)
--    add_library(CURL::CURL UNKNOWN IMPORTED)
--    set_property(TARGET CURL::CURL
-+# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
-+if (NOT TARGET CURL::libcurl)
-+    add_library(CURL::libcurl UNKNOWN IMPORTED)
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
--    set_property(TARGET CURL::CURL
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
- endif ()
-diff --git a/google/cloud/storage/tests/CMakeLists.txt b/google/cloud/storage/tests/CMakeLists.txt
-index 9e5fb663d..987958396 100644
---- a/google/cloud/storage/tests/CMakeLists.txt
-+++ b/google/cloud/storage/tests/CMakeLists.txt
-@@ -50,7 +50,7 @@ foreach (fname ${storage_client_integration_tests})
-                                   GTest::gmock_main
-                                   GTest::gmock
-                                   GTest::gtest
--                                  CURL::CURL
-+                                  CURL::libcurl
-                                   Threads::Threads
-                                   nlohmann_json
-                                   storage_common_options)
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 91dd7b83c..289c51a01 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -5,11 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.8.1
-    SHA512 d81e05703b77109cace4460f8053cf4524d8372ee9185b3ba7d8713ca40e9fd16735b4e46cd8526bf61b8af9a4bdf9eb854505a25d02289227cf216660b12713
+    REF v0.9.0
+    SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
     HEAD_REF master
 	PATCHES
-		cmake-libcurl-target.patch # Should not be needed for v0.9.0+ / once googleapis/google-cloud-cpp@3284e34 is included
 		cmake-libcurl-find-config.patch
 )