Skip to content

Commit c5d409b

Browse files
committed
dependency: update abseil-cpp to 20260107.1
1 parent a5e960d commit c5d409b

File tree

7 files changed

+44
-65
lines changed

7 files changed

+44
-65
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ bazel_dep(name = "rules_python", version = "1.8.3")
3737
bazel_dep(name = "rules_shell", version = "0.6.1")
3838

3939
# OR-Tools C++ dependencies
40-
bazel_dep(name = "abseil-cpp", version = "20250814.1")
40+
bazel_dep(name = "abseil-cpp", version = "20260107.1")
4141
bazel_dep(name = "bzip2", version = "1.0.8.bcr.3")
4242
bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
4343
bazel_dep(name = "glpk", version = "5.0.bcr.4")

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ if(BUILD_absl)
113113
FetchContent_Declare(
114114
absl
115115
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
116-
GIT_TAG "20250814.1"
116+
GIT_TAG "20260107.1"
117117
GIT_SHALLOW TRUE
118118
UPDATE_COMMAND git reset --hard
119119
PATCH_COMMAND git apply --ignore-whitespace
120-
"${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20250814.1.patch"
120+
"${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20260107.1.patch"
121121
OVERRIDE_FIND_PACKAGE
122122
SYSTEM
123123
)

cmake/java.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ add_custom_command(
336336
COMMAND ${CMAKE_COMMAND} -E
337337
$<IF:$<BOOL:${BUILD_absl}>,copy,true>
338338
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::base>>
339+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::borrowed_fixup_buffer>>
339340
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::city>>
340341
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::civil_time>>
341342
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::cord>>
@@ -406,7 +407,6 @@ add_custom_command(
406407
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::statusor>>
407408
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::str_format_internal>>
408409
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::strerror>>
409-
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::string_view>>
410410
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::strings>>
411411
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::strings_internal>>
412412
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::symbolize>>

cmake/python.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ add_custom_command(
514514
COMMAND ${CMAKE_COMMAND} -E
515515
$<IF:$<BOOL:${BUILD_absl}>,copy,true>
516516
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::base>>
517+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::borrowed_fixup_buffer>>
517518
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::city>>
518519
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::civil_time>>
519520
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::cord>>
@@ -584,7 +585,6 @@ add_custom_command(
584585
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::statusor>>
585586
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::str_format_internal>>
586587
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::strerror>>
587-
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::string_view>>
588588
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::strings>>
589589
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::strings_internal>>
590590
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::symbolize>>

ortools/dotnet/Google.OrTools.runtime.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
$<@need_windows_bzip2_lib@:;$<TARGET_FILE:BZip2::BZip2>>
3434

3535
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::base>>
36+
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::borrowed_fixup_buffer>>
3637
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::city>>
3738
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::civil_time>>
3839
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::cord>>
@@ -103,7 +104,6 @@
103104
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::statusor>>
104105
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::str_format_internal>>
105106
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::strerror>>
106-
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::string_view>>
107107
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::strings>>
108108
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::strings_internal>>
109109
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::symbolize>>

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)