Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to system version of octomap. #2881

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Switch to system version of octomap. #2881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f44e4
Switch to system version of octomap.
clalancette Jun 24, 2024
e269ac2
Merge branch 'main' into clalancette/switch-to-system-octomap
sjahr Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions moveit_core/package.xml
View file
Open in desktop
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
View file
Open in desktop
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
Loading