Skip to content

Commit

Permalink
Apply LTS transformations for 20210324 LTS branch (#920)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
derekmauro authored Mar 25, 2021
1 parent 1fdbe1e commit 997aaf3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMake/AbseilHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
if(ABSL_ENABLE_INSTALL)
set_target_properties(${_NAME} PROPERTIES
OUTPUT_NAME "absl_${_NAME}"
SOVERSION 0
SOVERSION "2103.0.0"
)
endif()
else()
Expand Down
14 changes: 2 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ endif (POLICY CMP0077)
# This must come before the project() and include(CTest) lines.
OPTION(BUILD_TESTING "Build tests" OFF)

project(absl LANGUAGES CXX)
project(absl LANGUAGES CXX VERSION 20210324)
include(CTest)

# Output directory is correct by default for most build setups. However, when
Expand Down Expand Up @@ -144,17 +144,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
Expand Down
4 changes: 2 additions & 2 deletions absl/base/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,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_20210324

// ABSL_OPTION_HARDENED
//
Expand Down

0 comments on commit 997aaf3

Please sign in to comment.