mirror of
https://github.com/abseil/abseil-cpp.git
synced 2026-06-04 12:07:05 +08:00
Apply LTS transformations for 20230802 LTS branch (#1505)
This commit is contained in:
@@ -298,7 +298,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
|
||||
if(ABSL_ENABLE_INSTALL)
|
||||
set_target_properties(${_NAME} PROPERTIES
|
||||
OUTPUT_NAME "absl_${_NAME}"
|
||||
SOVERSION 0
|
||||
SOVERSION "2308.0.0"
|
||||
)
|
||||
endif()
|
||||
else()
|
||||
|
||||
@@ -53,7 +53,7 @@ if (POLICY CMP0141)
|
||||
cmake_policy(SET CMP0141 NEW)
|
||||
endif (POLICY CMP0141)
|
||||
|
||||
project(absl LANGUAGES CXX)
|
||||
project(absl LANGUAGES CXX VERSION 20230802)
|
||||
include(CTest)
|
||||
|
||||
# Output directory is correct by default for most build setups. However, when
|
||||
@@ -181,17 +181,7 @@ endif()
|
||||
add_subdirectory(absl)
|
||||
|
||||
if(ABSL_ENABLE_INSTALL)
|
||||
# absl:lts-remove-begin(system installation is supported for LTS releases)
|
||||
# We don't support system-wide installation
|
||||
list(APPEND SYSTEM_INSTALL_DIRS "/usr/local" "/usr" "/opt/" "/opt/local" "c:/Program Files/${PROJECT_NAME}")
|
||||
if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX IN_LIST SYSTEM_INSTALL_DIRS)
|
||||
message(WARNING "\
|
||||
The default and system-level install directories are unsupported except in LTS \
|
||||
releases of Abseil. Please set CMAKE_INSTALL_PREFIX to install Abseil in your \
|
||||
source or build tree directly.\
|
||||
")
|
||||
endif()
|
||||
# absl:lts-remove-end
|
||||
|
||||
|
||||
# install as a subdirectory only
|
||||
install(EXPORT ${PROJECT_NAME}Targets
|
||||
|
||||
18
WORKSPACE
18
WORKSPACE
@@ -20,11 +20,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||
|
||||
# GoogleTest/GoogleMock framework. Used by most unit-tests.
|
||||
http_archive(
|
||||
name = "com_google_googletest", # 2023-08-02T16:45:10Z
|
||||
sha256 = "c4f675500e09da97fd5a2b9c3fdadf48de858a036db565d52e6835c96eeea147",
|
||||
strip_prefix = "googletest-843976e4f582ccb76cf87e0f128585324335779b",
|
||||
# Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh.
|
||||
urls = ["https://github.com/google/googletest/archive/843976e4f582ccb76cf87e0f128585324335779b.zip"],
|
||||
name = "com_google_googletest", # 2023-08-02T16:45:10Z
|
||||
sha256 = "1f357c27ca988c3f7c6b4bf68a9395005ac6761f034046e9dde0896e3aba00e4",
|
||||
strip_prefix = "googletest-1.14.0",
|
||||
# Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh.
|
||||
urls = ["https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip"],
|
||||
)
|
||||
|
||||
# RE2 (the regular expression library used by GoogleTest)
|
||||
@@ -45,10 +45,10 @@ http_archive(
|
||||
|
||||
# Bazel Skylib.
|
||||
http_archive(
|
||||
name = "bazel_skylib", # 2023-05-31T19:24:07Z
|
||||
sha256 = "08c0386f45821ce246bbbf77503c973246ed6ee5c3463e41efc197fa9bc3a7f4",
|
||||
strip_prefix = "bazel-skylib-288731ef9f7f688932bd50e704a91a45ec185f9b",
|
||||
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/288731ef9f7f688932bd50e704a91a45ec185f9b.zip"],
|
||||
name = "bazel_skylib", # 2023-05-31T19:24:07Z
|
||||
sha256 = "08c0386f45821ce246bbbf77503c973246ed6ee5c3463e41efc197fa9bc3a7f4",
|
||||
strip_prefix = "bazel-skylib-288731ef9f7f688932bd50e704a91a45ec185f9b",
|
||||
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/288731ef9f7f688932bd50e704a91a45ec185f9b.zip"],
|
||||
)
|
||||
|
||||
# Bazel platform rules.
|
||||
|
||||
@@ -111,8 +111,8 @@
|
||||
//
|
||||
// LTS releases can be obtained from
|
||||
// https://github.com/abseil/abseil-cpp/releases.
|
||||
#undef ABSL_LTS_RELEASE_VERSION
|
||||
#undef ABSL_LTS_RELEASE_PATCH_LEVEL
|
||||
#define ABSL_LTS_RELEASE_VERSION 20230802
|
||||
#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
|
||||
|
||||
// Helper macro to convert a CPP variable to a string literal.
|
||||
#define ABSL_INTERNAL_DO_TOKEN_STR(x) #x
|
||||
|
||||
@@ -199,8 +199,8 @@
|
||||
// be changed to a new, unique identifier name. In particular "head" is not
|
||||
// allowed.
|
||||
|
||||
#define ABSL_OPTION_USE_INLINE_NAMESPACE 0
|
||||
#define ABSL_OPTION_INLINE_NAMESPACE_NAME head
|
||||
#define ABSL_OPTION_USE_INLINE_NAMESPACE 1
|
||||
#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20230802
|
||||
|
||||
// ABSL_OPTION_HARDENED
|
||||
//
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
# The commit of GoogleTest to be used in the CMake tests in this directory.
|
||||
# Keep this in sync with the commit in the WORKSPACE file.
|
||||
readonly ABSL_GOOGLETEST_COMMIT="843976e4f582ccb76cf87e0f128585324335779b"
|
||||
readonly ABSL_GOOGLETEST_COMMIT="f8d7d77c06936315286eb55f8de22cd23c188571" # v1.14.0
|
||||
|
||||
# Avoid depending on GitHub by looking for a cached copy of the commit first.
|
||||
if [[ -r "${KOKORO_GFILE_DIR:-}/distdir/${ABSL_GOOGLETEST_COMMIT}.zip" ]]; then
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
|
||||
SETLOCAL ENABLEDELAYEDEXPANSION
|
||||
|
||||
SET ABSL_GOOGLETEST_COMMIT=843976e4f582ccb76cf87e0f128585324335779b
|
||||
:: Use GoogleTest v1.14.0
|
||||
SET ABSL_GOOGLETEST_COMMIT=f8d7d77c06936315286eb55f8de22cd23c188571
|
||||
|
||||
IF EXIST %KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip (
|
||||
SET ABSL_GOOGLETEST_DOWNLOAD_URL=file://%KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip
|
||||
|
||||
Reference in New Issue
Block a user