Skip to content

Commit

Permalink
Switch to system version of octomap. (#2881)
Browse files Browse the repository at this point in the history
This is so that we have a consistent ABI between these
packages and anything else in the system that depends
on octomap.  We'll eventually be removing the ROS-provided
version of octomap to make sure we don't have these problems
in the future.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
  • Loading branch information
clalancette and sjahr authored Jul 8, 2024
1 parent 365306e commit 42c5a29
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
8 changes: 1 addition & 7 deletions moveit_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@
<depend>libfcl-dev</depend>
<depend>moveit_common</depend>
<depend>moveit_msgs</depend>
<!--
Temporarily disable octomap dependency because of
version conflict. We use liboctomap-dev provided
by libfcl-dev.
See https://github.com/moveit/moveit2/issues/2862
<depend>octomap</depend>
-->
<depend>liboctomap-dev</depend>
<depend>octomap_msgs</depend>
<depend>osqp_vendor</depend>
<depend>pluginlib</depend>
Expand Down
8 changes: 1 addition & 7 deletions moveit_ros/occupancy_map_monitor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@
<depend>rclcpp</depend>
<depend>moveit_core</depend>
<depend>moveit_msgs</depend>
<!--
Temporarily disable octomap dependency because of
version conflict. We use liboctomap-dev provided
by moveit_core->libfcl-dev.
See https://github.com/moveit/moveit2/issues/2862
<depend>octomap</depend>
-->
<depend>liboctomap-dev</depend>
<depend version_gte="1.11.2">pluginlib</depend>
<depend>tf2_ros</depend>
<depend>geometric_shapes</depend>
Expand Down

0 comments on commit 42c5a29

Please sign in to comment.