mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 04:53:02 +08:00
[google-cloud-cpp] update to latest release (v2.0.0) (#25608)
* [google-cloud-cpp] update to latest release (v2.0.0) * Disable `channel` and `asset` features on Windows Protobuf <= 3.19 does not know about the `TRUE` and `DOMAIN` macros on Windows, so it cannot hide said macros when used as enum values in a proto file. vcpkg uses protobuf==3.19.4 * Fix formatting * Fix versions
This commit is contained in:
parent
0cb819175b
commit
ce9dc455ef
@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO googleapis/google-cloud-cpp
|
||||
REF v1.42.0
|
||||
SHA512 a4220aa4388bc3a1f3e24268c65193b6b01632fe661e952e8eaf898933e2bdc6e4f2254c5d1cc23b0853d8fbeb6de0510aa14f63b39d70d28b6430432430e468
|
||||
REF v2.0.0
|
||||
SHA512 9843c6b739c556be27e5e355b915ffdfa946a9e0a139da8b3a03a8c0abe6beb9088cfc0ba5c6fce1e32acbbce8384ffe59a752213c4bcec4c65a5b3ca8a9baf1
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
support_absl_cxx17.patch
|
||||
|
@ -1,9 +1,9 @@
|
||||
diff --git a//CMakeLists.txt b/CMakeLists.txt
|
||||
index 4d03fee..42bb13c 100644
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a0d07d1..18320b6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -43,6 +43,14 @@ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD)
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
endif ()
|
||||
|
||||
+find_package(absl CONFIG REQUIRED)
|
||||
@ -15,18 +15,18 @@ index 4d03fee..42bb13c 100644
|
||||
+endif ()
|
||||
+
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
|
||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3)
|
||||
message(
|
||||
diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h
|
||||
index f02cb7a..0ea8c9c 100644
|
||||
index b61eb48..327278f 100644
|
||||
--- a/google/cloud/internal/port_platform.h
|
||||
+++ b/google/cloud/internal/port_platform.h
|
||||
@@ -49,6 +49,8 @@
|
||||
// Abort compilation if the compiler does not support C++11.
|
||||
#if GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L
|
||||
# error "C++11 or newer is required"
|
||||
// Abort compilation if the compiler does not support C++14.
|
||||
#if GOOGLE_CLOUD_CPP_CPP_VERSION < 201402L
|
||||
# error "C++14 or newer is required"
|
||||
+#elif defined(ABSL_USE_CXX17) && GOOGLE_CLOUD_CPP_CPP_VERSION < 201703L
|
||||
+# error "Compiled to use Abseil with C++17 support, but using with C++ < C++17"
|
||||
#endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L
|
||||
#endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201402L
|
||||
|
||||
// Abort the build if the version of the compiler is too old. With CMake we
|
||||
// Abort the build if the version of the compiler is too old. This simplifies
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "google-cloud-cpp",
|
||||
"version": "1.42.0",
|
||||
"version": "2.0.0",
|
||||
"description": "C++ Client Libraries for Google Cloud Platform APIs.",
|
||||
"homepage": "https://github.com/googleapis/google-cloud-cpp",
|
||||
"license": "Apache-2.0",
|
||||
@ -99,6 +99,7 @@
|
||||
},
|
||||
"asset": {
|
||||
"description": "Cloud Asset API C++ Client Library",
|
||||
"supports": "!windows",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "google-cloud-cpp",
|
||||
@ -183,6 +184,7 @@
|
||||
},
|
||||
"channel": {
|
||||
"description": "Cloud Channel API C++ Client Library",
|
||||
"supports": "!windows",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "google-cloud-cpp",
|
||||
|
@ -2633,7 +2633,7 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"google-cloud-cpp": {
|
||||
"baseline": "1.42.0",
|
||||
"baseline": "2.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"google-cloud-cpp-common": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "71a72e78da707ee567b96bc835cf25cd8e8eb975",
|
||||
"version": "2.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "95315156a8c6fefdde56b6c4718062975ff7e0ce",
|
||||
"version": "1.42.0",
|
||||
|
Loading…
Reference in New Issue
Block a user