Skip to content

Commit ad73c6d

Browse files
authored
Apply LTS transformations for 20240116 LTS branch (#1599)
1 parent 10f3e61 commit ad73c6d

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

CMake/AbseilHelpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
298298
if(ABSL_ENABLE_INSTALL)
299299
set_target_properties(${_NAME} PROPERTIES
300300
OUTPUT_NAME "absl_${_NAME}"
301-
SOVERSION 0
301+
SOVERSION "2401.0.0"
302302
)
303303
endif()
304304
else()

CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (POLICY CMP0141)
5858
cmake_policy(SET CMP0141 NEW)
5959
endif (POLICY CMP0141)
6060

61-
project(absl LANGUAGES CXX)
61+
project(absl LANGUAGES CXX VERSION 20240116)
6262
include(CTest)
6363

6464
# Output directory is correct by default for most build setups. However, when
@@ -186,17 +186,7 @@ endif()
186186
add_subdirectory(absl)
187187

188188
if(ABSL_ENABLE_INSTALL)
189-
# absl:lts-remove-begin(system installation is supported for LTS releases)
190-
# We don't support system-wide installation
191-
list(APPEND SYSTEM_INSTALL_DIRS "/usr/local" "/usr" "/opt/" "/opt/local" "c:/Program Files/${PROJECT_NAME}")
192-
if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX IN_LIST SYSTEM_INSTALL_DIRS)
193-
message(WARNING "\
194-
The default and system-level install directories are unsupported except in LTS \
195-
releases of Abseil. Please set CMAKE_INSTALL_PREFIX to install Abseil in your \
196-
source or build tree directly.\
197-
")
198-
endif()
199-
# absl:lts-remove-end
189+
200190

201191
# install as a subdirectory only
202192
install(EXPORT ${PROJECT_NAME}Targets

MODULE.bazel

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

1717
module(
1818
name = "abseil-cpp",
19-
version = "head",
19+
version = "20240116.0",
2020
compatibility_level = 1,
2121
)
2222

absl/base/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
//
118118
// LTS releases can be obtained from
119119
// https://github.com/abseil/abseil-cpp/releases.
120-
#undef ABSL_LTS_RELEASE_VERSION
121-
#undef ABSL_LTS_RELEASE_PATCH_LEVEL
120+
#define ABSL_LTS_RELEASE_VERSION 20240116
121+
#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
122122

123123
// Helper macro to convert a CPP variable to a string literal.
124124
#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
@@ -225,8 +225,8 @@
225225
// be changed to a new, unique identifier name. In particular "head" is not
226226
// allowed.
227227

228-
#define ABSL_OPTION_USE_INLINE_NAMESPACE 0
229-
#define ABSL_OPTION_INLINE_NAMESPACE_NAME head
228+
#define ABSL_OPTION_USE_INLINE_NAMESPACE 1
229+
#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240116
230230

231231
// ABSL_OPTION_HARDENED
232232
//

0 commit comments

Comments
 (0)