mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 11:39:01 +08:00
[abseil] Upgrade to 20210324 (#16928)
* [abseil] Upgrade to 20210324 * Use new version field Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
This commit is contained in:
parent
6d9ed56811
commit
c94ecfa8f6
@ -1,12 +0,0 @@
|
|||||||
diff --git a/absl/copts/AbseilConfigureCopts.cmake b/absl/copts/AbseilConfigureCopts.cmake
|
|
||||||
index acd46d0..6081527 100644
|
|
||||||
--- a/absl/copts/AbseilConfigureCopts.cmake
|
|
||||||
+++ b/absl/copts/AbseilConfigureCopts.cmake
|
|
||||||
@@ -41,7 +41,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
|
||||||
# clang-cl is half MSVC, half LLVM
|
|
||||||
set(ABSL_DEFAULT_COPTS "${ABSL_CLANG_CL_FLAGS}")
|
|
||||||
set(ABSL_TEST_COPTS "${ABSL_CLANG_CL_FLAGS};${ABSL_CLANG_CL_TEST_FLAGS}")
|
|
||||||
- set(ABSL_DEFAULT_LINKOPTS "${ABSL_MSVC_LINKOPTS}")
|
|
||||||
else()
|
|
||||||
set(ABSL_DEFAULT_COPTS "${ABSL_LLVM_FLAGS}")
|
|
||||||
set(ABSL_TEST_COPTS "${ABSL_LLVM_FLAGS};${ABSL_LLVM_TEST_FLAGS}")
|
|
@ -5,8 +5,8 @@ endif()
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO abseil/abseil-cpp
|
REPO abseil/abseil-cpp
|
||||||
REF 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c #LTS 20200923, Patch 3
|
REF 997aaf3a28308eba1b9156aa35ab7bca9688e9f6 #LTS 20210324
|
||||||
SHA512 f64fee62863f2103c1991136fd3bc2b71cd28c7ff62138ac991b5a7f81780a05e0e2bdd6a119d02e1d70dd54f989f584093957efaec94f26c9d6c3f4ee37f8ae
|
SHA512 bdd80a2278eef121e8837791fdebca06e87bfff4adc438c123e0ce11efc42a8bd461edcbbe18c0eee05be2cd6100f9acf8eab3db58ac73322b5852e6ffe7c85b
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
# in C++17 mode, use std::any, std::optional, std::string_view, std::variant
|
# in C++17 mode, use std::any, std::optional, std::string_view, std::variant
|
||||||
@ -15,12 +15,11 @@ vcpkg_from_github(
|
|||||||
# detection can cause ABI issues depending on which compiler options
|
# detection can cause ABI issues depending on which compiler options
|
||||||
# are enabled for consuming user code
|
# are enabled for consuming user code
|
||||||
fix-cxx-standard.patch
|
fix-cxx-standard.patch
|
||||||
# Official patch https://github.com/abseil/abseil-cpp/commit/58a9c6d53f93078101c2c0bd98d2951e74328a55
|
|
||||||
fix-msvc-flags.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
cxx17 ABSL_USE_CXX17
|
FEATURES
|
||||||
|
cxx17 ABSL_USE_CXX17
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_configure_cmake(
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "abseil",
|
"name": "abseil",
|
||||||
"version-string": "2020-09-23",
|
"version-date": "2021-03-24",
|
||||||
"port-version": 3,
|
|
||||||
"description": [
|
"description": [
|
||||||
"an open-source collection designed to augment the C++ standard library.",
|
"an open-source collection designed to augment the C++ standard library.",
|
||||||
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
|
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "d58deb5198f8a1d72eafc3e1d6bdb36197fac470",
|
||||||
|
"version-date": "2021-03-24",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "184230b7622b1be5630f893dcecdaac7acde101f",
|
"git-tree": "184230b7622b1be5630f893dcecdaac7acde101f",
|
||||||
"version-string": "2020-09-23",
|
"version-string": "2020-09-23",
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
"port-version": 2
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"abseil": {
|
"abseil": {
|
||||||
"baseline": "2020-09-23",
|
"baseline": "2021-03-24",
|
||||||
"port-version": 3
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"absent": {
|
"absent": {
|
||||||
"baseline": "0.3.1",
|
"baseline": "0.3.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user