Skip to content

Commit 9bfcafb

Browse files
committed
dependency: bump abseil-cpp to 20260107.1
1 parent a2876ca commit 9bfcafb

File tree

3 files changed

+40
-61
lines changed

3 files changed

+40
-61
lines changed

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ if(BUILD_absl)
3636
FetchContent_Declare(
3737
absl
3838
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
39-
GIT_TAG "20250814.1"
39+
GIT_TAG "20260107.1"
4040
GIT_SHALLOW TRUE
4141
UPDATE_COMMAND git reset --hard
4242
PATCH_COMMAND git apply --ignore-whitespace
43-
"${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20250814.1.patch"
43+
"${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20260107.1.patch"
4444
OVERRIDE_FIND_PACKAGE
4545
)
4646
set(ABSL_USE_SYSTEM_INCLUDES ON)

patches/abseil-cpp-20250814.1.patch

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
2+
index 61e1ae4..3e6ec94 100644
3+
--- a/CMake/AbseilHelpers.cmake
4+
+++ b/CMake/AbseilHelpers.cmake
5+
@@ -350,7 +350,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
6+
endif()
7+
endif()
8+
9+
- if(ABSL_ENABLE_INSTALL)
10+
+ if(ABSL_ENABLE_INSTALL AND NOT ABSL_CC_LIB_TESTONLY)
11+
install(TARGETS ${_NAME} EXPORT ${PROJECT_NAME}Targets
12+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
13+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
14+
diff --git a/CMakeLists.txt b/CMakeLists.txt
15+
index 26dc8e7..cd4fef1 100644
16+
--- a/CMakeLists.txt
17+
+++ b/CMakeLists.txt
18+
@@ -145,7 +145,7 @@ if((BUILD_TESTING AND ABSL_BUILD_TESTING) OR ABSL_BUILD_TEST_HELPERS)
19+
add_library(GTest::gmock ALIAS gmock)
20+
add_library(GTest::gmock_main ALIAS gmock_main)
21+
else()
22+
- message(FATAL_ERROR "ABSL_USE_EXTERNAL_GOOGLETEST is ON and ABSL_FIND_GOOGLETEST is OFF, which means that the top-level project must build the Google Test project. However, the target gtest was not found.")
23+
+ message(WARNING "ABSL_USE_EXTERNAL_GOOGLETEST is ON and ABSL_FIND_GOOGLETEST is OFF, which means that the top-level project must build the Google Test project. However, the target gtest was not found.")
24+
endif()
25+
endif()
26+
else()
27+
diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
28+
index 365c6ea..d12e585 100644
29+
--- a/absl/container/CMakeLists.txt
30+
+++ b/absl/container/CMakeLists.txt
31+
@@ -1119,6 +1119,7 @@ absl_cc_library(
32+
absl::config
33+
absl::test_instance_tracker
34+
GTest::gmock
35+
+ TESTONLY
36+
)
37+
38+
absl_cc_library(

0 commit comments

Comments
 (0)