Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abseil-cpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
abseil-cpp
Commits
d583a597
Unverified
Commit
d583a597
authored
Aug 02, 2023
by
Derek Mauro
Committed by
GitHub
Aug 02, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply LTS transformations for 20230802 LTS branch (#1505)
parent
fdf5be11
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
22 deletions
+13
-22
CMake/AbseilHelpers.cmake
+1
-1
CMakeLists.txt
+2
-12
WORKSPACE
+3
-3
absl/base/config.h
+2
-2
absl/base/options.h
+2
-2
ci/cmake_common.sh
+1
-1
ci/windows_msvc_cmake.bat
+2
-1
No files found.
CMake/AbseilHelpers.cmake
View file @
d583a597
...
...
@@ -298,7 +298,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
if
(
ABSL_ENABLE_INSTALL
)
set_target_properties
(
${
_NAME
}
PROPERTIES
OUTPUT_NAME
"absl_
${
_NAME
}
"
SOVERSION
0
SOVERSION
"2308.0.0"
)
endif
()
else
()
...
...
CMakeLists.txt
View file @
d583a597
...
...
@@ -53,7 +53,7 @@ if (POLICY CMP0141)
cmake_policy
(
SET CMP0141 NEW
)
endif
(
POLICY CMP0141
)
project
(
absl LANGUAGES CXX
)
project
(
absl LANGUAGES CXX
VERSION 20230802
)
include
(
CTest
)
# Output directory is correct by default for most build setups. However, when
...
...
@@ -181,17 +181,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
...
...
WORKSPACE
View file @
d583a597
...
...
@@ -21,10 +21,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# GoogleTest/GoogleMock framework. Used by most unit-tests.
http_archive(
name = "com_google_googletest", # 2023-08-02T16:45:10Z
sha256 = "c4f675500e09da97fd5a2b9c3fdadf48de858a036db565d52e6835c96eeea147
",
strip_prefix = "googletest-843976e4f582ccb76cf87e0f128585324335779b
",
sha256 = "1f357c27ca988c3f7c6b4bf68a9395005ac6761f034046e9dde0896e3aba00e4
",
strip_prefix = "googletest-1.14.0
",
# Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh.
urls = ["https://github.com/google/googletest/archive/843976e4f582ccb76cf87e0f128585324335779b
.zip"],
urls = ["https://github.com/google/googletest/archive/refs/tags/v1.14.0
.zip"],
)
# RE2 (the regular expression library used by GoogleTest)
...
...
absl/base/config.h
View file @
d583a597
...
...
@@ -111,8 +111,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 20230802
#
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
...
...
absl/base/options.h
View file @
d583a597
...
...
@@ -199,8 +199,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_20230802
// ABSL_OPTION_HARDENED
//
...
...
ci/cmake_common.sh
View file @
d583a597
...
...
@@ -14,7 +14,7 @@
# 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.
readonly
ABSL_GOOGLETEST_COMMIT
=
"
843976e4f582ccb76cf87e0f128585324335779b"
readonly
ABSL_GOOGLETEST_COMMIT
=
"
f8d7d77c06936315286eb55f8de22cd23c188571"
# v1.14.0
# 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
...
...
ci/windows_msvc_cmake.bat
View file @
d583a597
...
...
@@ -14,7 +14,8 @@
SETLOCAL ENABLEDELAYEDEXPANSION
SET ABSL_GOOGLETEST_COMMIT=843976e4f582ccb76cf87e0f128585324335779b
:: Use GoogleTest v1.14.0
SET ABSL_GOOGLETEST_COMMIT=f8d7d77c06936315286eb55f8de22cd23c188571
IF EXIST %KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip (
SET ABSL_GOOGLETEST_DOWNLOAD_URL=file://%KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment