Skip to content

Commit

Permalink
Fix octomap dependency version to 1.9.7...<1.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
henningkayser committed Jun 7, 2024
1 parent 256c46c commit 9e862f7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ find_package(console_bridge REQUIRED)
find_package(console_bridge_vendor REQUIRED)
find_package(eigen_stl_containers REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(OCTOMAP REQUIRED)
# Enforce the system package version on Ubuntu jammy and noble which is also used by libfcl-dev
# The version is fixed to prevent ABI conflicts with ros-octomap
find_package(octomap 1.9.7...<1.10.0 REQUIRED)
find_package(QHULL REQUIRED)
find_package(random_numbers REQUIRED)
find_package(rclcpp REQUIRED)
Expand All @@ -60,7 +62,7 @@ set(THIS_PACKAGE_EXPORT_DEPENDS
console_bridge_vendor
eigen_stl_containers
geometry_msgs
OCTOMAP
octomap
random_numbers
rclcpp
resource_retriever
Expand Down
9 changes: 9 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@
<depend>eigen_stl_containers</depend>
<depend>console_bridge_vendor</depend>
<depend>libqhull</depend>
<!-- The ros-octomap package version is ABI-incompatible with
the liboctomap-dev system dependency of FCL (libfcl-dev)
used by MoveIt. Until this conflict is resolved, we are
enforcing the use of liboctomap-dev by declaring the
libfcl-dev dependency here (lacking a liboctomap-dev target)
and by setting a library version filter in the CMakeLists.txt.
See https://github.com/moveit/moveit2/issues/2862
<depend>octomap</depend>
-->
<depend>libfcl-dev</depend>
<depend>random_numbers</depend>
<depend>resource_retriever</depend>
<depend>shape_msgs</depend>
Expand Down

0 comments on commit 9e862f7

Please sign in to comment.