Commit 78be6368 by Derek Mauro Committed by GitHub

Apply LTS transformations for 20230125 LTS branch (#1370)

parent a69b0ae5
...@@ -311,7 +311,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") ...@@ -311,7 +311,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
if(ABSL_ENABLE_INSTALL) if(ABSL_ENABLE_INSTALL)
set_target_properties(${_NAME} PROPERTIES set_target_properties(${_NAME} PROPERTIES
OUTPUT_NAME "absl_${_NAME}" OUTPUT_NAME "absl_${_NAME}"
SOVERSION 0 SOVERSION "2301.0.0"
) )
endif() endif()
else() else()
......
...@@ -48,7 +48,7 @@ if (POLICY CMP0067) ...@@ -48,7 +48,7 @@ if (POLICY CMP0067)
cmake_policy(SET CMP0067 NEW) cmake_policy(SET CMP0067 NEW)
endif (POLICY CMP0067) endif (POLICY CMP0067)
project(absl LANGUAGES CXX) project(absl LANGUAGES CXX VERSION 20230125)
include(CTest) include(CTest)
# Output directory is correct by default for most build setups. However, when # Output directory is correct by default for most build setups. However, when
...@@ -176,17 +176,7 @@ endif() ...@@ -176,17 +176,7 @@ endif()
add_subdirectory(absl) add_subdirectory(absl)
if(ABSL_ENABLE_INSTALL) 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 as a subdirectory only
install(EXPORT ${PROJECT_NAME}Targets install(EXPORT ${PROJECT_NAME}Targets
......
...@@ -21,10 +21,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") ...@@ -21,10 +21,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# GoogleTest/GoogleMock framework. Used by most unit-tests. # GoogleTest/GoogleMock framework. Used by most unit-tests.
http_archive( http_archive(
name = "com_google_googletest", # 2023-01-05T19:15:29Z name = "com_google_googletest", # 2023-01-05T19:15:29Z
sha256 = "1c805208d019aabb8be3cddbc6098be8815ee5cf0a7baf526102528fd624c422", sha256 = "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632",
strip_prefix = "googletest-934542165899c786cb5d8a710529c37184730183", strip_prefix = "googletest-1.13.0",
# Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh. # Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh.
urls = ["https://github.com/google/googletest/archive/934542165899c786cb5d8a710529c37184730183.zip"], urls = ["https://github.com/google/googletest/archive/refs/tags/v1.13.0.zip"],
) )
# RE2 (the regular expression library used by GoogleTest) # RE2 (the regular expression library used by GoogleTest)
......
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
// //
// LTS releases can be obtained from // LTS releases can be obtained from
// https://github.com/abseil/abseil-cpp/releases. // https://github.com/abseil/abseil-cpp/releases.
#undef ABSL_LTS_RELEASE_VERSION #define ABSL_LTS_RELEASE_VERSION 20230125
#undef ABSL_LTS_RELEASE_PATCH_LEVEL #define ABSL_LTS_RELEASE_PATCH_LEVEL 0
// Helper macro to convert a CPP variable to a string literal. // Helper macro to convert a CPP variable to a string literal.
#define ABSL_INTERNAL_DO_TOKEN_STR(x) #x #define ABSL_INTERNAL_DO_TOKEN_STR(x) #x
......
...@@ -199,8 +199,8 @@ ...@@ -199,8 +199,8 @@
// be changed to a new, unique identifier name. In particular "head" is not // be changed to a new, unique identifier name. In particular "head" is not
// allowed. // allowed.
#define ABSL_OPTION_USE_INLINE_NAMESPACE 0 #define ABSL_OPTION_USE_INLINE_NAMESPACE 1
#define ABSL_OPTION_INLINE_NAMESPACE_NAME head #define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20230125
// ABSL_OPTION_HARDENED // ABSL_OPTION_HARDENED
// //
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# The commit of GoogleTest to be used in the CMake tests in this directory. # The commit of GoogleTest to be used in the CMake tests in this directory.
# Keep this in sync with the commit in the WORKSPACE file. # Keep this in sync with the commit in the WORKSPACE file.
readonly ABSL_GOOGLETEST_COMMIT="934542165899c786cb5d8a710529c37184730183" readonly ABSL_GOOGLETEST_COMMIT="b796f7d44681514f58a683a3a71ff17c94edb0c1" # v1.13.0
# Avoid depending on GitHub by looking for a cached copy of the commit first. # Avoid depending on GitHub by looking for a cached copy of the commit first.
if [[ -r "${KOKORO_GFILE_DIR:-}/distdir/${ABSL_GOOGLETEST_COMMIT}.zip" ]]; then if [[ -r "${KOKORO_GFILE_DIR:-}/distdir/${ABSL_GOOGLETEST_COMMIT}.zip" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment