Skip to content

Commit

Permalink
update backward ros and patch
Browse files Browse the repository at this point in the history
Signed-off-by: wep21 <[email protected]>
  • Loading branch information
wep21 committed Feb 5, 2025
1 parent e70036d commit b3e69b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 24 deletions.
26 changes: 4 additions & 22 deletions patch/ros-jazzy-backward-ros.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64af86c..9be355d 100644
index 317f65f..1f38e81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ include(cmake/BackwardConfig.cmake)
Expand Down Expand Up @@ -33,10 +33,10 @@ index 77d22d2..8e95287 100644
list(APPEND _BACKWARD_INCLUDE_DIRS ${BACKWARD_INCLUDE_DIR})

diff --git a/cmake/BackwardConfigAment.cmake b/cmake/BackwardConfigAment.cmake
index 273a51a..d981cbb 100644
index 273a51a..3a1a726 100644
--- a/cmake/BackwardConfigAment.cmake
+++ b/cmake/BackwardConfigAment.cmake
@@ -24,5 +24,13 @@ foreach(lib ${backward_ros_forced_LIBRARIES})
@@ -24,5 +24,12 @@ foreach(lib ${backward_ros_forced_LIBRARIES})
set(backward_ros_full_path_LIBRARIES "${backward_ros_full_path_LIBRARIES} ${lib}")
endif()
endforeach()
Expand All @@ -50,26 +50,8 @@ index 273a51a..d981cbb 100644
+endif()
+
+SET(CMAKE_EXE_LINKER_FLAGS "${no_as_needed} ${backward_ros_full_path_LIBRARIES} ${as_needed} ${CMAKE_EXE_LINKER_FLAGS}")
+
diff --git a/backward_rosConfig.cmake.in b/backward_rosConfig.cmake.in
index 6713e91..282e194 100644
--- a/backward_rosConfig.cmake.in
+++ b/backward_rosConfig.cmake.in
@@ -2,8 +2,10 @@
set_and_check(backward_ros_INCLUDE_DIRS "@BACKWARD_ROS_INSTALL_PREFIX@/include")
if(WIN32)
set_and_check(backward_ros_LIBRARIES "@BACKWARD_ROS_INSTALL_PREFIX@/lib/backward.lib")
+elseif(APPLE)
+set_and_check(backward_ros_LIBRARIES "@BACKWARD_ROS_INSTALL_PREFIX@/lib/libbackward.dylib")
else()
set_and_check(backward_ros_LIBRARIES "@BACKWARD_ROS_INSTALL_PREFIX@/lib/libbackward.so")
endif()
check_required_components(backward_ros)
-include(@BACKWARD_ROS_INSTALL_PREFIX@/share/@PROJECT_NAME@/cmake/BackwardConfigAment.cmake)
\ No newline at end of file
+include(@BACKWARD_ROS_INSTALL_PREFIX@/share/@PROJECT_NAME@/cmake/BackwardConfigAment.cmake)
diff --git a/package.xml b/package.xml
index e8bc10a..d39e613 100644
index 6de8f0e..3ac0db1 100644
--- a/package.xml
+++ b/package.xml
@@ -11,6 +11,7 @@
Expand Down
4 changes: 2 additions & 2 deletions rosdistro_snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,9 @@ azure_iot_sdk_c:
url: https://github.com/ros2-gbp/azure_iot_sdk_c-release.git
version: 1.14.0
backward_ros:
tag: release/jazzy/backward_ros/1.0.6-1
tag: release/jazzy/backward_ros/1.0.7-1
url: https://github.com/ros2-gbp/backward_ros-release.git
version: 1.0.6
version: 1.0.7
bag2_to_image:
tag: release/jazzy/bag2_to_image/0.1.0-5
url: https://github.com/ros2-gbp/bag2_to_image-release.git
Expand Down

0 comments on commit b3e69b6

Please sign in to comment.