Skip to content

Commit 997aaf3

Browse files
authored
Apply LTS transformations for 20210324 LTS branch (#920)
* Apply LTS transformations for 20210324 LTS branch * Change the SOVERSION to make MacOS happy MacOS expects the first part of the SOVERSION to fit into 16 bits.
1 parent 1fdbe1e commit 997aaf3

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

CMake/AbseilHelpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
263263
if(ABSL_ENABLE_INSTALL)
264264
set_target_properties(${_NAME} PROPERTIES
265265
OUTPUT_NAME "absl_${_NAME}"
266-
SOVERSION 0
266+
SOVERSION "2103.0.0"
267267
)
268268
endif()
269269
else()

CMakeLists.txt

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

48-
project(absl LANGUAGES CXX)
48+
project(absl LANGUAGES CXX VERSION 20210324)
4949
include(CTest)
5050

5151
# Output directory is correct by default for most build setups. However, when
@@ -144,17 +144,7 @@ endif()
144144
add_subdirectory(absl)
145145

146146
if(ABSL_ENABLE_INSTALL)
147-
# absl:lts-remove-begin(system installation is supported for LTS releases)
148-
# We don't support system-wide installation
149-
list(APPEND SYSTEM_INSTALL_DIRS "/usr/local" "/usr" "/opt/" "/opt/local" "c:/Program Files/${PROJECT_NAME}")
150-
if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX IN_LIST SYSTEM_INSTALL_DIRS)
151-
message(WARNING "\
152-
The default and system-level install directories are unsupported except in LTS \
153-
releases of Abseil. Please set CMAKE_INSTALL_PREFIX to install Abseil in your \
154-
source or build tree directly.\
155-
")
156-
endif()
157-
# absl:lts-remove-end
147+
158148

159149
# install as a subdirectory only
160150
install(EXPORT ${PROJECT_NAME}Targets

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_20210324
210210

211211
// ABSL_OPTION_HARDENED
212212
//

0 commit comments

Comments
 (0)