From f3a9bb35a98280c3c10e332c00cf9e4cf8e9c5cd Mon Sep 17 00:00:00 2001
From: tabbleman <tabbleman11@gmail.com>
Date: Thu, 25 Jul 2024 04:51:03 +0000
Subject: [PATCH] all in one patch

---
 cartographer-ros-fix-absl.patch | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/cartographer-ros-fix-absl.patch b/cartographer-ros-fix-absl.patch
index 9c6da21..8c7459b 100644
--- a/cartographer-ros-fix-absl.patch
+++ b/cartographer-ros-fix-absl.patch
@@ -1,7 +1,16 @@
-diff -Naur ros-humble-cartographer-ros-2.0.9000_orgin/CMakeLists.txt ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt
---- ros-humble-cartographer-ros-2.0.9000_orgin/CMakeLists.txt	2022-04-20 08:01:33.000000000 +0800
-+++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt	2023-10-25 10:21:05.000000000 +0800
-@@ -50,6 +50,8 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 213770e..7651bc3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ endif()
+ 
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++set(ABSL_PATCH_LIBRARIES absl_log_internal_check_op absl_log_internal_message)
+ 
+ find_package(builtin_interfaces REQUIRED)
+ find_package(cartographer REQUIRED)
+@@ -50,6 +51,8 @@ find_package(urdf REQUIRED)
  find_package(urdfdom_headers REQUIRED)
  find_package(visualization_msgs REQUIRED)
  
@@ -10,3 +19,12 @@ diff -Naur ros-humble-cartographer-ros-2.0.9000_orgin/CMakeLists.txt ros-humble-
  include_directories(
    include
    ${PCL_INCLUDE_DIRS}
+@@ -103,7 +106,7 @@ set(dependencies
+ ament_target_dependencies(${PROJECT_NAME}
+   ${dependencies}
+   )
+-target_link_libraries(${PROJECT_NAME} cartographer ${PCL_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} cartographer ${PCL_LIBRARIES} ${ABSL_PATCH_LIBRARIES})
+ 
+ # Executables
+ add_executable(cartographer_node src/node_main.cpp)
-- 
Gitee