Skip to content

Commit 04325ef

Browse files
mosfet80mosfet80
committed
fix ament_target_deprecation
fix ament_target_dependencies deprecation Update CMakeLists.txt Update CMakeLists.txt Update planning_scene_ros_api_tutorial.cpp
1 parent b0ba2a9 commit 04325ef

File tree

19 files changed

+88
-50
lines changed

19 files changed

+88
-50
lines changed

‎doc/examples/collision_environments/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
12
add_executable(collision_scene_example
23
src/collision_scene_example.cpp)
34
target_include_directories(collision_scene_example
45
PUBLIC include)
5-
ament_target_dependencies(collision_scene_example
6-
${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
6+
target_link_libraries(collision_scene_example PUBLIC rclcpp::rclcpp moveit_ros_planning_interface::moveit_move_group_interface)
77

88
install(TARGETS collision_scene_example
99
ARCHIVE DESTINATION lib

‎doc/examples/interactivity/CMakeLists.txt‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,6 @@ add_library(${INTERACTIVITY_LIB_NAME}
66
src/pose_string.cpp
77
)
88

9-
# add_executable(interactivity_tutorial
10-
# src/interactivity_tutorial.cpp
11-
# src/interactive_robot.cpp
12-
# src/imarker.cpp
13-
# src/pose_string.cpp
14-
# )
15-
# target_link_libraries(interactivity_tutorial
16-
# ${catkin_LIBRARIES}
17-
# ${Boost_LIBRARIES}
18-
# ${interactive_markers_LIBRARIES}
19-
# )
20-
#
21-
# add_executable(attached_body_tutorial
22-
# src/attached_body_tutorial.cpp
23-
# src/interactive_robot.cpp
24-
# src/imarker.cpp
25-
# src/pose_string.cpp
26-
# )
27-
289
target_link_libraries(
2910
${INTERACTIVITY_LIB_NAME}
3011
${catkin_LIBRARIES}

‎doc/examples/motion_planning_api/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ add_executable(motion_planning_api_tutorial
22
src/motion_planning_api_tutorial.cpp)
33
target_include_directories(motion_planning_api_tutorial
44
PUBLIC include)
5-
ament_target_dependencies(motion_planning_api_tutorial
6-
${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
5+
target_link_libraries(motion_planning_api_tutorial PUBLIC pluginlib::pluginlib moveit_ros_planning::moveit_robot_model_loader moveit_visual_tools::moveit_visual_tools
6+
moveit_ros_planning_interface::moveit_move_group_interface)
77

88
install(TARGETS motion_planning_api_tutorial
99
DESTINATION lib/${PROJECT_NAME}

‎doc/examples/motion_planning_pipeline/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ add_executable(motion_planning_pipeline_tutorial
22
src/motion_planning_pipeline_tutorial.cpp)
33
target_include_directories(motion_planning_pipeline_tutorial
44
PUBLIC include)
5-
ament_target_dependencies(motion_planning_pipeline_tutorial
6-
${THIS_PACKAGE_INCLUDE_DEPENDS})
5+
target_link_libraries(motion_planning_pipeline_tutorial PUBLIC pluginlib::pluginlib moveit_ros_planning::moveit_robot_model_loader moveit_ros_occupancy_map_monitor::moveit_ros_occupancy_map_monitor moveit_visual_tools::moveit_visual_tools)
6+
77

88
install(TARGETS motion_planning_pipeline_tutorial
99
DESTINATION lib/${PROJECT_NAME}

‎doc/examples/move_group_interface/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ add_executable(move_group_interface_tutorial
22
src/move_group_interface_tutorial.cpp)
33
target_include_directories(move_group_interface_tutorial
44
PUBLIC include)
5-
ament_target_dependencies(move_group_interface_tutorial
6-
${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
5+
#ament_target_dependencies(move_group_interface_tutorial ${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
6+
target_link_libraries(move_group_interface_tutorial PUBLIC moveit_ros_move_group::moveit_move_group_capabilities_base
7+
moveit_ros_planning_interface::moveit_move_group_interface moveit_visual_tools::moveit_visual_tools)
78

89
install(TARGETS move_group_interface_tutorial
910
DESTINATION lib/${PROJECT_NAME}

‎doc/examples/moveit_cpp/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
find_package(moveit_visual_tools REQUIRED)
2+
13
add_executable(moveit_cpp_tutorial src/moveit_cpp_tutorial.cpp)
24
target_include_directories(moveit_cpp_tutorial PUBLIC include)
3-
ament_target_dependencies(moveit_cpp_tutorial ${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
5+
#ament_target_dependencies(moveit_cpp_tutorial ${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
6+
target_link_libraries(moveit_cpp_tutorial PUBLIC rclcpp::rclcpp moveit_ros_planning::moveit_cpp moveit_visual_tools::moveit_visual_tools)
47

58
install(TARGETS moveit_cpp_tutorial
69
DESTINATION lib/${PROJECT_NAME}

‎doc/examples/planning_scene/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ add_executable(planning_scene_tutorial
22
src/planning_scene_tutorial.cpp)
33
target_include_directories(planning_scene_tutorial
44
PUBLIC include)
5-
ament_target_dependencies(planning_scene_tutorial
6-
${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
5+
#ament_target_dependencies(planning_scene_tutorial ${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
6+
target_link_libraries(planning_scene_tutorial PUBLIC rclcpp::rclcpp moveit_ros_planning::moveit_robot_model_loader)
77

88
install(TARGETS planning_scene_tutorial
99
DESTINATION lib/${PROJECT_NAME}

‎doc/examples/planning_scene_ros_api/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ add_executable(planning_scene_ros_api_tutorial
22
src/planning_scene_ros_api_tutorial.cpp)
33
target_include_directories(planning_scene_ros_api_tutorial
44
PUBLIC include)
5-
ament_target_dependencies(planning_scene_ros_api_tutorial
6-
${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)
5+
6+
target_link_libraries(planning_scene_ros_api_tutorial PRIVATE rclcpp::rclcpp moveit_msgs::moveit_msgs__rosidl_typesupport_cpp rviz_visual_tools::rviz_visual_tools
7+
moveit_core::moveit_planning_scene moveit_ros_planning::moveit_robot_model_loader ${geometry_msgs_TARGETS} moveit_visual_tools::moveit_visual_tools)
78

89
install(TARGETS planning_scene_ros_api_tutorial
910
DESTINATION lib/${PROJECT_NAME}

‎doc/examples/realtime_servo/CMakeLists.txt‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
add_executable(pose_tracking_tutorial src/pose_tracking_tutorial.cpp)
22
target_include_directories(pose_tracking_tutorial PUBLIC include)
3-
ament_target_dependencies(pose_tracking_tutorial ${THIS_PACKAGE_INCLUDE_DEPENDS})
3+
target_link_libraries(pose_tracking_tutorial PUBLIC tf2_eigen::tf2_eigen
4+
# moveit_ros_planning::default_request_adapter_parameters
5+
# moveit_ros_planning::default_response_adapter_parameters
6+
# moveit_ros_planning::kinematics_parameters
7+
# moveit_ros_planning::moveit_collision_plugin_loader
8+
# moveit_ros_planning::moveit_constraint_sampler_manager_loader
9+
# moveit_ros_planning::moveit_cpp
10+
# moveit_ros_planning::moveit_kinematics_plugin_loader
11+
# moveit_ros_planning::moveit_plan_execution
12+
# moveit_ros_planning::moveit_planning_pipeline
13+
# moveit_ros_planning::moveit_planning_pipeline_interfaces
14+
moveit_ros_planning::moveit_planning_scene_monitor
15+
# moveit_ros_planning::moveit_rdf_loader
16+
# moveit_ros_planning::moveit_robot_model_loader
17+
# moveit_ros_planning::moveit_trajectory_execution_manager
18+
# moveit_ros_planning::planning_pipeline_parameters
19+
# moveit_ros_planning::srdf_publisher_node
20+
moveit_servo::moveit_servo_lib_cpp
21+
22+
23+
)#rclcpp::rclcpp ${visualization_msgs_TARGETS} moveit_servo::moveit_servo_lib_cpp ${moveit_msgs_TARGETS} moveit_ros_planning::moveit_cpp control_msgs::control_msgs__rosidl_typesupport_fastrtps_cpp moveit_msgs::moveit_msgs__rosidl_typesupport_cpp visualization_msgs::visualization_msgs__rosidl_generator_c
24+
425

526
install(
627
TARGETS

‎doc/examples/realtime_servo/src/pose_tracking_tutorial.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* Description : Example of using pose tracking via the ROS API in a door opening scenario.
4141
*/
4242

43-
#include <rclcpp/rclcpp.hpp>
43+
//#include <rclcpp/rclcpp.hpp>
4444
#include <tf2_eigen/tf2_eigen.hpp>
4545
#include <moveit_msgs/msg/planning_scene.hpp>
4646
#include <visualization_msgs/msg/marker.hpp>
@@ -119,7 +119,7 @@ class Door
119119

120120
rclcpp::Node::SharedPtr node_;
121121
Eigen::Vector3d hinge_, center_, dims_;
122-
double angle_, step_, rotation_radius_;
122+
double angle_, rotation_radius_;
123123
rclcpp::Publisher<moveit_msgs::msg::PlanningScene>::SharedPtr collision_object_publisher_;
124124
moveit_msgs::msg::CollisionObject collision_object_;
125125
shape_msgs::msg::SolidPrimitive door_primitive_;

0 commit comments

Comments
 (0)