Skip to content

Commit

Permalink
Apply LTS transformations for 20240722 LTS branch (#1724)
Browse files Browse the repository at this point in the history
  • Loading branch information
derekmauro authored Jul 22, 2024
1 parent 3358286 commit ebdba5a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 18 deletions.
16 changes: 3 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ if (POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
endif (POLICY CMP0141)

project(absl LANGUAGES CXX)
set(ABSL_SOVERSION 0)
project(absl LANGUAGES CXX VERSION 20240722)
set(ABSL_SOVERSION "2407.0.0")
include(CTest)

# Output directory is correct by default for most build setups. However, when
Expand Down Expand Up @@ -173,17 +173,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
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module(
name = "abseil-cpp",
version = "head",
version = "20240722.0",
compatibility_level = 1,
)

Expand Down
4 changes: 2 additions & 2 deletions absl/base/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
//
// LTS releases can be obtained from
// https://github.com/abseil/abseil-cpp/releases.
#undef ABSL_LTS_RELEASE_VERSION
#undef ABSL_LTS_RELEASE_PATCH_LEVEL
#define ABSL_LTS_RELEASE_VERSION 20240722
#define ABSL_LTS_RELEASE_PATCH_LEVEL 0

// Helper macro to convert a CPP variable to a string literal.
#define ABSL_INTERNAL_DO_TOKEN_STR(x) #x
Expand Down
4 changes: 2 additions & 2 deletions absl/base/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,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_20240722

// ABSL_OPTION_HARDENED
//
Expand Down

0 comments on commit ebdba5a

Please sign in to comment.