Skip to content

Commit 6a72279

Browse files
authored
Apply LTS transformations for 20211102 LTS branch (#1050)
1 parent 3b22e57 commit 6a72279

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

CMake/AbseilHelpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
278278
if(ABSL_ENABLE_INSTALL)
279279
set_target_properties(${_NAME} PROPERTIES
280280
OUTPUT_NAME "absl_${_NAME}"
281-
SOVERSION 0
281+
SOVERSION "2111.0.0"
282282
)
283283
endif()
284284
else()

CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ endif (POLICY CMP0091)
5050
# This must come before the project() and include(CTest) lines.
5151
OPTION(BUILD_TESTING "Build tests" OFF)
5252

53-
project(absl LANGUAGES CXX)
53+
project(absl LANGUAGES CXX VERSION 20211102)
5454
include(CTest)
5555

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

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

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

absl/base/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
//
9393
// LTS releases can be obtained from
9494
// https://github.com/abseil/abseil-cpp/releases.
95-
#undef ABSL_LTS_RELEASE_VERSION
96-
#undef ABSL_LTS_RELEASE_PATCH_LEVEL
95+
#define ABSL_LTS_RELEASE_VERSION 20211102
96+
#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
9797

9898
// Helper macro to convert a CPP variable to a string literal.
9999
#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
@@ -205,8 +205,8 @@
205205
// be changed to a new, unique identifier name. In particular "head" is not
206206
// allowed.
207207

208-
#define ABSL_OPTION_USE_INLINE_NAMESPACE 0
209-
#define ABSL_OPTION_INLINE_NAMESPACE_NAME head
208+
#define ABSL_OPTION_USE_INLINE_NAMESPACE 1
209+
#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20211102
210210

211211
// ABSL_OPTION_HARDENED
212212
//

0 commit comments

Comments
 (0)