From 00ba3be307ed7f55c0b582c10b5102692f0c9d5b Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@gmail.com>
Date: Mon, 24 Jun 2024 17:54:51 +0000
Subject: [PATCH] Switch to using the system version of octomap.

The new liboctomap-dev key pulls the octomap dependency
from the system, rather than the ros-<distro>-octomap.
This will ensure a consistent ABI between octomap as
used in system libraries and the one in ROS.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
---
 package.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/package.xml b/package.xml
index bddfa89..fdfabbc 100644
--- a/package.xml
+++ b/package.xml
@@ -28,16 +28,7 @@
   <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>liboctomap-dev</depend>
   <depend>random_numbers</depend>
   <depend>resource_retriever</depend>
   <depend>shape_msgs</depend>