diff options
Diffstat (limited to 'ports/google-cloud-cpp')
| -rw-r--r-- | ports/google-cloud-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/cmake-libcurl-find-config.patch | 142 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/cmake-libcurl-target.patch | 144 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/portfile.cmake | 9 |
4 files changed, 4 insertions, 293 deletions
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 0f689c9e0..6c1b23391 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.10.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-find-config.patch b/ports/google-cloud-cpp/cmake-libcurl-find-config.patch deleted file mode 100644 index 0c1d6dd6f..000000000 --- a/ports/google-cloud-cpp/cmake-libcurl-find-config.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake -index 6ea7ca3e6..3c2db6b28 100644 ---- a/cmake/IncludeCurl.cmake -+++ b/cmake/IncludeCurl.cmake -@@ -34,49 +34,57 @@ set_property(CACHE GOOGLE_CLOUD_CPP_CURL_PROVIDER - if ("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "external") - include(external/curl) - elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package") -- # Search for libcurl, in CMake 3.5 this does not define a target, but it -- # will in 3.12 (see https://cmake.org/cmake/help/git- -- # stage/module/FindCURL.html for details). Until then, define the target -- # ourselves if it is missing. -- find_package(CURL REQUIRED) -- 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::libcurl -- APPEND -- PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") -- endif () -- # If the library is static, we need to explicitly link its dependencies. -- # However, we should not do so for shared libraries, because the version of -- # OpenSSL (for example) found by find_package() may be newer than the -- # version linked against libcurl. -- if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$") -- find_package(OpenSSL REQUIRED) -- find_package(ZLIB REQUIRED) -- set_property(TARGET CURL::libcurl -- APPEND -- PROPERTY INTERFACE_LINK_LIBRARIES -- OpenSSL::SSL -- OpenSSL::Crypto -- ZLIB::ZLIB) -- message(STATUS "CURL linkage will be static") -- if (WIN32) -+ # Search for libcurl, first using CONFIG mode, and retrying -+ # using MODULE mode if that fails -+ find_package(CURL CONFIG QUIET) # Deliberately quiet, so we can handle the result -+ if(CURL_FOUND) -+ message(STATUS "CURL library found via CONFIG mode") -+ else() -+ # CONFIG mode failed - fallback to MODULE mode -+ # In CMake 3.5 this does not define a target, but it -+ # will in 3.12 (see https://cmake.org/cmake/help/git- -+ # stage/module/FindCURL.html for details). Until then, define the target -+ # ourselves if it is missing. -+ find_package(CURL MODULE REQUIRED) # Use REQUIRED the second time to fail out -+ if (NOT TARGET CURL::libcurl) -+ add_library(CURL::libcurl UNKNOWN IMPORTED) - set_property(TARGET CURL::libcurl - APPEND -- PROPERTY INTERFACE_LINK_LIBRARIES -- crypt32 -- wsock32 -- ws2_32) -+ PROPERTY INTERFACE_INCLUDE_DIRECTORIES -+ "${CURL_INCLUDE_DIR}") -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") - endif () -- if (APPLE) -+ # If the library is static, we need to explicitly link its dependencies. -+ # However, we should not do so for shared libraries, because the version of -+ # OpenSSL (for example) found by find_package() may be newer than the -+ # version linked against libcurl. -+ if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$") -+ find_package(OpenSSL REQUIRED) -+ find_package(ZLIB REQUIRED) - set_property(TARGET CURL::libcurl - APPEND -- PROPERTY INTERFACE_LINK_LIBRARIES ldap) -+ PROPERTY INTERFACE_LINK_LIBRARIES -+ OpenSSL::SSL -+ OpenSSL::Crypto -+ ZLIB::ZLIB) -+ message(STATUS "CURL linkage will be static") -+ if (WIN32) -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY INTERFACE_LINK_LIBRARIES -+ crypt32 -+ wsock32 -+ ws2_32) -+ endif () -+ if (APPLE) -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY INTERFACE_LINK_LIBRARIES ldap) -+ endif () -+ else() -+ message(STATUS "CURL linkage will be non-static") - endif () -- else() -- message(STATUS "CURL linkage will be non-static") - endif () - endif () -diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in -index a4d261815..640089e09 100644 ---- a/google/cloud/storage/config.cmake.in -+++ b/google/cloud/storage/config.cmake.in -@@ -13,21 +13,25 @@ - # limitations under the License. - - include(CMakeFindDependencyMacro) --find_dependency(CURL) -+# Search for libcurl, first using CONFIG mode, and retrying -+# using MODULE mode if that fails -+find_package(CURL CONFIG QUIET) # find_package so we can explicitly specify QUIET -+if(NOT CURL_FOUND) -+ find_dependency(CURL MODULE) -+ # 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::libcurl -+ APPEND -+ PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") -+ endif () -+endif() - find_dependency(Crc32c) - find_dependency(google_cloud_cpp_common) - find_dependency(OpenSSL) - find_dependency(ZLIB) - --# 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::libcurl -- APPEND -- PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") --endif () -- - include("${CMAKE_CURRENT_LIST_DIR}/storage-targets.cmake") 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..84c5c0240 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,13 +4,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 + REPO googleapis/google-cloud-cpp + REF v0.10.0 + SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3 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 ) vcpkg_configure_cmake( |