Skip to content

Commit 047dfd3

Browse files
sea-basssea-bass
authored
Fix dependency exports and update to .hpp includes (#66)
solves adding moveit_drake as a dependency
1 parent 15c9687 commit 047dfd3

8 files changed

+27
-25
lines changed

Diff for: ‎CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ install(
7878
DESTINATION include/drake)
7979

8080
ament_export_targets(moveit_drakeTargets HAS_LIBRARY_TARGET)
81-
ament_export_dependencies(moveit_core drake::drake generate_parameter_library)
81+
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS} drake
82+
generate_parameter_library)
8283

8384
add_subdirectory(demo)
8485

Diff for: ‎demo/src/constrained_planning_demo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <chrono>
22

3-
#include <moveit/move_group_interface/move_group_interface.h>
4-
#include <moveit/planning_scene_interface/planning_scene_interface.h>
3+
#include <moveit/move_group_interface/move_group_interface.hpp>
4+
#include <moveit/planning_scene_interface/planning_scene_interface.hpp>
55
#include <moveit_msgs/msg/collision_object.hpp>
66
#include <moveit_visual_tools/moveit_visual_tools.h>
77
#include <std_msgs/msg/color_rgba.hpp>

Diff for: ‎demo/src/pipeline_testbench_main.cpp

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
#include <rclcpp/rclcpp.hpp>
22
#include <memory>
3-
// MoveitCpp
4-
#include <moveit/moveit_cpp/moveit_cpp.h>
5-
#include <moveit/moveit_cpp/planning_component.h>
63

7-
#include <geometry_msgs/msg/point_stamped.h>
8-
#include <geometry_msgs/msg/pose.h>
4+
#include <geometry_msgs/msg/point_stamped.hpp>
5+
#include <geometry_msgs/msg/pose.hpp>
6+
7+
// MoveitCpp
8+
#include <moveit/moveit_cpp/moveit_cpp.hpp>
9+
#include <moveit/moveit_cpp/planning_component.hpp>
910

1011
#include <moveit_visual_tools/moveit_visual_tools.h>
1112

1213
// Warehouse
13-
#include <moveit/warehouse/planning_scene_storage.h>
14-
#include <moveit/warehouse/planning_scene_storage.h>
15-
#include <moveit/warehouse/state_storage.h>
16-
#include <moveit/warehouse/constraints_storage.h>
17-
#include <moveit/warehouse/trajectory_constraints_storage.h>
14+
#include <moveit/warehouse/planning_scene_storage.hpp>
15+
#include <moveit/warehouse/planning_scene_storage.hpp>
16+
#include <moveit/warehouse/state_storage.hpp>
17+
#include <moveit/warehouse/constraints_storage.hpp>
18+
#include <moveit/warehouse/trajectory_constraints_storage.hpp>
1819
#include <warehouse_ros/database_loader.h>
1920

2021
namespace rvt = rviz_visual_tools;

Diff for: ‎include/ktopt_interface/ktopt_planning_context.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <ktopt_moveit_parameters.hpp>
4-
#include <moveit/planning_interface/planning_interface.h>
3+
#include <moveit/planning_interface/planning_interface.hpp>
4+
#include <moveit_drake/ktopt_moveit_parameters.hpp>
55
#include <shape_msgs/msg/solid_primitive.h>
66

77
// relevant drake includes

Diff for: ‎include/moveit/drake/conversions.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
Desc: TODO
3737
*/
3838

39-
#include <moveit/planning_scene/planning_scene.h>
40-
#include <moveit/robot_trajectory/robot_trajectory.h>
39+
#include <moveit/planning_scene/planning_scene.hpp>
40+
#include <moveit/robot_trajectory/robot_trajectory.hpp>
4141

4242
#include <drake/multibody/parsing/parser.h>
4343
#include <drake/geometry/scene_graph.h>

Diff for: ‎src/add_toppra_time_parameterization.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838

3939
#include <moveit/drake/conversions.hpp>
40-
#include <moveit/planning_interface/planning_response_adapter.h>
40+
#include <moveit/planning_interface/planning_response_adapter.hpp>
4141
#include <class_loader/class_loader.hpp>
4242
#include <moveit/utils/logger.hpp>
4343

Diff for: ‎src/ktopt_planner_manager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <memory>
2-
#include <moveit/planning_interface/planning_interface.h>
3-
#include <moveit/planning_interface/planning_response.h>
4-
#include <moveit/planning_scene/planning_scene.h>
2+
#include <moveit/planning_interface/planning_interface.hpp>
3+
#include <moveit/planning_interface/planning_response.hpp>
4+
#include <moveit/planning_scene/planning_scene.hpp>
55
#include <moveit/utils/logger.hpp>
66
#include <class_loader/class_loader.hpp>
77
#include <rclcpp/node.hpp>

Diff for: ‎src/ktopt_planning_context.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#include <drake/visualization/visualization_config.h>
1717
#include <drake/visualization/visualization_config_functions.h>
1818

19-
#include <moveit/constraint_samplers/constraint_sampler_manager.h>
19+
#include <moveit/constraint_samplers/constraint_sampler_manager.hpp>
2020
#include <moveit/drake/conversions.hpp>
21-
#include <moveit/planning_interface/planning_interface.h>
22-
#include <moveit/planning_scene/planning_scene.h>
23-
#include <moveit/robot_state/conversions.h>
21+
#include <moveit/planning_interface/planning_interface.hpp>
22+
#include <moveit/planning_scene/planning_scene.hpp>
23+
#include <moveit/robot_state/conversions.hpp>
2424

2525
#include <ktopt_interface/ktopt_planning_context.hpp>
2626

0 commit comments

Comments
 (0)