always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump absl to 20250127.0 for cmake

Browse Source
This commit is contained in:
Laurent Perron
2025-03-03 14:47:26 +01:00
parent 6fbfa2b87a
commit 6c81f1187e
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/dependencies/CMakeLists.txt
View File

@@ -85,9 +85,9 @@ if(BUILD_absl)
FetchContent_Declare(
absl
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
GIT_TAG "20240722.0"
GIT_TAG "20250127.0"
GIT_SHALLOW TRUE
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240722.0.patch"
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20250127.0.patch"
)
FetchContent_MakeAvailable(absl)
list(POP_BACK CMAKE_MESSAGE_INDENT)

2
cmake/java.cmake
View File

@@ -364,6 +364,7 @@ add_custom_command(
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -396,6 +397,7 @@ add_custom_command(
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::synchronization>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>

2
cmake/python.cmake
View File

@@ -524,6 +524,7 @@ add_custom_command(
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -557,6 +558,7 @@ add_custom_command(
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
$<${need_windows_absl_lib}:$<TARGET_FILE:absl::abseil_dll>>

2
ortools/dotnet/Google.OrTools.runtime.csproj.in
View File

@@ -78,6 +78,7 @@
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_format>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_globals>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_message>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -111,6 +112,7 @@
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::throw_delegate>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time_zone>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::tracing_internal>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
$<@need_windows_absl_lib@:;$<TARGET_FILE:absl::abseil_dll>>

0
patches/abseil-cpp-20240722.0.patch → patches/abseil-cpp-20250127.0.patch
View File