Skip to content

Commit 6c81f11

Browse files
committed
bump absl to 20250127.0 for cmake
1 parent 6fbfa2b commit 6c81f11

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ if(BUILD_absl)
8585
FetchContent_Declare(
8686
absl
8787
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
88-
GIT_TAG "20240722.0"
88+
GIT_TAG "20250127.0"
8989
GIT_SHALLOW TRUE
90-
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240722.0.patch"
90+
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20250127.0.patch"
9191
)
9292
FetchContent_MakeAvailable(absl)
9393
list(POP_BACK CMAKE_MESSAGE_INDENT)

cmake/java.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ add_custom_command(
364364
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
365365
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
366366
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
367+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
367368
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
368369
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
369370
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -396,6 +397,7 @@ add_custom_command(
396397
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::synchronization>>
397398
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
398399
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
400+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
399401
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
400402
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
401403
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>

cmake/python.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@ add_custom_command(
524524
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
525525
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
526526
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
527+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
527528
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
528529
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
529530
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -557,6 +558,7 @@ add_custom_command(
557558
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
558559
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
559560
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
561+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
560562
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
561563
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
562564
$<${need_windows_absl_lib}:$<TARGET_FILE:absl::abseil_dll>>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_format>>
7979
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_globals>>
8080
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
81+
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
8182
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_message>>
8283
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
8384
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -111,6 +112,7 @@
111112
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::throw_delegate>>
112113
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time>>
113114
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time_zone>>
115+
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::tracing_internal>>
114116
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
115117
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
116118
$<@need_windows_absl_lib@:;$<TARGET_FILE:absl::abseil_dll>>

0 commit comments

Comments
 (0)