Skip to content

Commit b65c2d1

Browse files
committed
resolute: drop octomap version range
moveit2 already treats octomap like any other system dependency since PR #2881 (which switched moveit_core / moveit_ros/occupancy_map_monitor from <depend>octomap</depend> to <depend>liboctomap-dev</depend>). The 1.9.7...<1.10.0 range in CMakeLists.txt was the leftover artifact of #2862's defensive workaround for an ABI skew that moveit2's own deps no longer create. The range also blocks moveit_core from configuring on Ubuntu Resolute, which ships liboctomap-dev 1.10. Drop the range entirely. find_package(octomap REQUIRED) matches the convention used by fcl, Eigen3, pluginlib, and the rest of moveit_core. Refs: #2862, #2881.
1 parent e9471ff commit b65c2d1

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

moveit_core/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ find_package(geometric_shapes REQUIRED)
1818
find_package(geometry_msgs REQUIRED)
1919
find_package(kdl_parser REQUIRED)
2020
find_package(moveit_msgs REQUIRED)
21-
# Enforce system version liboctomap-dev
22-
# https://github.com/moveit/moveit2/issues/2862
23-
find_package(octomap 1.9.7...<1.10.0 REQUIRED)
21+
find_package(octomap REQUIRED)
2422
find_package(octomap_msgs REQUIRED)
2523
find_package(osqp REQUIRED)
2624
find_package(pluginlib REQUIRED)

moveit_ros/occupancy_map_monitor/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ find_package(moveit_core REQUIRED)
1313
find_package(moveit_msgs REQUIRED)
1414
find_package(pluginlib REQUIRED)
1515
find_package(Eigen3 REQUIRED)
16-
# Enforce system version liboctomap-dev
17-
# https://github.com/moveit/moveit2/issues/2862
18-
find_package(octomap 1.9.7...<1.10.0 REQUIRED)
16+
find_package(octomap REQUIRED)
1917
find_package(geometric_shapes REQUIRED)
2018
find_package(tf2_ros REQUIRED)
2119

0 commit comments

Comments
 (0)