Skip to content

Commit 78be636

Browse files
authored
Apply LTS transformations for 20230125 LTS branch (#1370)
1 parent a69b0ae commit 78be636

File tree

6 files changed

+11
-21
lines changed

6 files changed

+11
-21
lines changed

CMake/AbseilHelpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
311311
if(ABSL_ENABLE_INSTALL)
312312
set_target_properties(${_NAME} PROPERTIES
313313
OUTPUT_NAME "absl_${_NAME}"
314-
SOVERSION 0
314+
SOVERSION "2301.0.0"
315315
)
316316
endif()
317317
else()

CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if (POLICY CMP0067)
4848
cmake_policy(SET CMP0067 NEW)
4949
endif (POLICY CMP0067)
5050

51-
project(absl LANGUAGES CXX)
51+
project(absl LANGUAGES CXX VERSION 20230125)
5252
include(CTest)
5353

5454
# Output directory is correct by default for most build setups. However, when
@@ -176,17 +176,7 @@ endif()
176176
add_subdirectory(absl)
177177

178178
if(ABSL_ENABLE_INSTALL)
179-
# absl:lts-remove-begin(system installation is supported for LTS releases)
180-
# We don't support system-wide installation
181-
list(APPEND SYSTEM_INSTALL_DIRS "/usr/local" "/usr" "/opt/" "/opt/local" "c:/Program Files/${PROJECT_NAME}")
182-
if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX IN_LIST SYSTEM_INSTALL_DIRS)
183-
message(WARNING "\
184-
The default and system-level install directories are unsupported except in LTS \
185-
releases of Abseil. Please set CMAKE_INSTALL_PREFIX to install Abseil in your \
186-
source or build tree directly.\
187-
")
188-
endif()
189-
# absl:lts-remove-end
179+
190180

191181
# install as a subdirectory only
192182
install(EXPORT ${PROJECT_NAME}Targets

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2121
# GoogleTest/GoogleMock framework. Used by most unit-tests.
2222
http_archive(
2323
name = "com_google_googletest", # 2023-01-05T19:15:29Z
24-
sha256 = "1c805208d019aabb8be3cddbc6098be8815ee5cf0a7baf526102528fd624c422",
25-
strip_prefix = "googletest-934542165899c786cb5d8a710529c37184730183",
24+
sha256 = "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632",
25+
strip_prefix = "googletest-1.13.0",
2626
# Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh.
27-
urls = ["https://github.com/google/googletest/archive/934542165899c786cb5d8a710529c37184730183.zip"],
27+
urls = ["https://github.com/google/googletest/archive/refs/tags/v1.13.0.zip"],
2828
)
2929

3030
# RE2 (the regular expression library used by GoogleTest)

absl/base/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
//
112112
// LTS releases can be obtained from
113113
// https://github.com/abseil/abseil-cpp/releases.
114-
#undef ABSL_LTS_RELEASE_VERSION
115-
#undef ABSL_LTS_RELEASE_PATCH_LEVEL
114+
#define ABSL_LTS_RELEASE_VERSION 20230125
115+
#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
116116

117117
// Helper macro to convert a CPP variable to a string literal.
118118
#define ABSL_INTERNAL_DO_TOKEN_STR(x) #x

absl/base/options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@
199199
// be changed to a new, unique identifier name. In particular "head" is not
200200
// allowed.
201201

202-
#define ABSL_OPTION_USE_INLINE_NAMESPACE 0
203-
#define ABSL_OPTION_INLINE_NAMESPACE_NAME head
202+
#define ABSL_OPTION_USE_INLINE_NAMESPACE 1
203+
#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20230125
204204

205205
// ABSL_OPTION_HARDENED
206206
//

ci/cmake_common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# The commit of GoogleTest to be used in the CMake tests in this directory.
1616
# Keep this in sync with the commit in the WORKSPACE file.
17-
readonly ABSL_GOOGLETEST_COMMIT="934542165899c786cb5d8a710529c37184730183"
17+
readonly ABSL_GOOGLETEST_COMMIT="b796f7d44681514f58a683a3a71ff17c94edb0c1" # v1.13.0
1818

1919
# Avoid depending on GitHub by looking for a cached copy of the commit first.
2020
if [[ -r "${KOKORO_GFILE_DIR:-}/distdir/${ABSL_GOOGLETEST_COMMIT}.zip" ]]; then

0 commit comments

Comments
 (0)