dependencies: Bump abseil-cpp to 20240722.0
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
ZLIB=1.3.1
|
||||
abseil-cpp=20240116.2
|
||||
abseil-cpp=20240722.0
|
||||
Protobuf=v26.1
|
||||
Eigen=3.4.0
|
||||
Re2=2024-04-01
|
||||
|
||||
@@ -81,8 +81,8 @@ new_git_repository(
|
||||
## Abseil-cpp
|
||||
git_repository(
|
||||
name = "com_google_absl",
|
||||
tag = "20240116.2",
|
||||
patches = ["//patches:abseil-cpp-20240116.2.patch"],
|
||||
tag = "20240722.0",
|
||||
patches = ["//patches:abseil-cpp-20240722.0.patch"],
|
||||
patch_args = ["-p1"],
|
||||
remote = "https://github.com/abseil/abseil-cpp.git",
|
||||
)
|
||||
|
||||
@@ -84,9 +84,9 @@ if(BUILD_absl)
|
||||
FetchContent_Declare(
|
||||
absl
|
||||
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
|
||||
GIT_TAG "20240116.2"
|
||||
GIT_TAG "20240722.0"
|
||||
GIT_SHALLOW TRUE
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240116.2.patch"
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240722.0.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(absl)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
|
||||
@@ -105,8 +105,8 @@ set(ABSL_PROPAGATE_CXX_STD ON)
|
||||
FetchContent_Declare(
|
||||
absl
|
||||
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
|
||||
GIT_TAG "20240116.2"
|
||||
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20240116.2.patch")
|
||||
GIT_TAG "20240722.0"
|
||||
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20240722.0.patch")
|
||||
FetchContent_MakeAvailable(absl)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
message(CHECK_PASS "fetched")
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
exports_files([
|
||||
"abseil-cpp-20240116.2.patch",
|
||||
"abseil-cpp-20240722.0.patch",
|
||||
"highs.patch",
|
||||
"protobuf-v26.1.patch",
|
||||
"pybind11_abseil.patch",
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
|
||||
index 47f3beeb..43217c85 100644
|
||||
index 32cc28f..e51d6df 100644
|
||||
--- a/CMake/AbseilDll.cmake
|
||||
+++ b/CMake/AbseilDll.cmake
|
||||
@@ -624,31 +624,44 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS
|
||||
@@ -699,31 +699,44 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS
|
||||
|
||||
include(CheckCXXSourceCompiles)
|
||||
|
||||
@@ -69,7 +69,7 @@ index 47f3beeb..43217c85 100644
|
||||
|
||||
if(ABSL_INTERNAL_AT_LEAST_CXX20)
|
||||
set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_20)
|
||||
@@ -656,6 +669,7 @@ elseif(ABSL_INTERNAL_AT_LEAST_CXX17)
|
||||
@@ -731,6 +744,7 @@ elseif(ABSL_INTERNAL_AT_LEAST_CXX17)
|
||||
set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_17)
|
||||
else()
|
||||
set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_14)
|
||||
@@ -77,34 +77,3 @@ index 47f3beeb..43217c85 100644
|
||||
endif()
|
||||
|
||||
function(absl_internal_dll_contains)
|
||||
diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
|
||||
index 128cc0e9..11d65d55 100644
|
||||
--- a/absl/container/CMakeLists.txt
|
||||
+++ b/absl/container/CMakeLists.txt
|
||||
@@ -213,6 +213,7 @@ absl_cc_library(
|
||||
DEPS
|
||||
absl::config
|
||||
GTest::gmock
|
||||
+ TESTONLY
|
||||
)
|
||||
|
||||
absl_cc_test(
|
||||
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
|
||||
index c53b358..9906382 100644
|
||||
--- a/CMake/AbseilHelpers.cmake
|
||||
+++ b/CMake/AbseilHelpers.cmake
|
||||
@@ -250,6 +250,14 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
|
||||
elseif(_build_type STREQUAL "static" OR _build_type STREQUAL "shared")
|
||||
add_library(${_NAME} "")
|
||||
target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS})
|
||||
+ if(APPLE)
|
||||
+ set_target_properties(${_NAME} PROPERTIES
|
||||
+ INSTALL_RPATH "@loader_path")
|
||||
+ elseif(UNIX)
|
||||
+ set_target_properties(${_NAME} PROPERTIES
|
||||
+ POSITION_INDEPENDENT_CODE ON
|
||||
+ INSTALL_RPATH "$ORIGIN")
|
||||
+ endif()
|
||||
target_link_libraries(${_NAME}
|
||||
PUBLIC ${ABSL_CC_LIB_DEPS}
|
||||
PRIVATE
|
||||
Reference in New Issue
Block a user