Skip to content

Commit 1eacc5a

Browse files
committed
fix ament deprecation
.
1 parent 89aa0b6 commit 1eacc5a

File tree

1 file changed

+57
-18
lines changed

1 file changed

+57
-18
lines changed

CMakeLists.txt

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.20)
22
project(moveit_visual_tools)
33

44
find_package(moveit_common REQUIRED)
@@ -20,20 +20,6 @@ find_package(tf2_ros REQUIRED)
2020
find_package(trajectory_msgs REQUIRED)
2121
find_package(visualization_msgs REQUIRED)
2222

23-
set(THIS_PACKAGE_INCLUDE_DEPENDS
24-
Boost
25-
geometry_msgs
26-
graph_msgs
27-
moveit_core
28-
moveit_ros_planning
29-
rclcpp
30-
rviz_visual_tools
31-
std_msgs
32-
tf2_eigen
33-
tf2_ros
34-
trajectory_msgs
35-
visualization_msgs
36-
)
3723

3824
# Visualization Tools Library
3925
add_library(${PROJECT_NAME} SHARED
@@ -46,7 +32,61 @@ target_include_directories(${PROJECT_NAME}
4632
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
4733
PUBLIC $<INSTALL_INTERFACE:include>
4834
)
49-
ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_INCLUDE_DEPENDS})
35+
36+
target_link_libraries(moveit_visual_tools PUBLIC
37+
${geometry_msgs_TARGETS}
38+
${graph_msgs_TARGETS}
39+
${std_msgs_TARGETS}
40+
${trajectory_msgs_TARGETS}
41+
${visualization_msgs_TARGETS}
42+
moveit_core::moveit_collision_detection
43+
moveit_core::moveit_collision_detection_bullet
44+
moveit_core::moveit_collision_detection_fcl
45+
moveit_core::moveit_collision_distance_field
46+
moveit_core::moveit_constraint_samplers
47+
moveit_core::moveit_distance_field
48+
moveit_core::moveit_dynamics_solver
49+
moveit_core::moveit_exceptions
50+
moveit_core::moveit_kinematic_constraints
51+
moveit_core::moveit_kinematics_base
52+
moveit_core::moveit_kinematics_metrics
53+
moveit_core::moveit_macros
54+
moveit_core::moveit_planning_interface
55+
moveit_core::moveit_planning_scene
56+
moveit_core::moveit_robot_model
57+
moveit_core::moveit_robot_state
58+
moveit_core::moveit_robot_trajectory
59+
moveit_core::moveit_smoothing_base
60+
moveit_core::moveit_test_utils
61+
moveit_core::moveit_trajectory_processing
62+
moveit_core::moveit_transforms
63+
moveit_core::moveit_utils
64+
moveit_ros_planning::default_request_adapter_parameters
65+
moveit_ros_planning::default_response_adapter_parameters
66+
moveit_ros_planning::kinematics_parameters
67+
moveit_ros_planning::moveit_collision_plugin_loader
68+
moveit_ros_planning::moveit_constraint_sampler_manager_loader
69+
moveit_ros_planning::moveit_cpp
70+
moveit_ros_planning::moveit_kinematics_plugin_loader
71+
moveit_ros_planning::moveit_plan_execution
72+
moveit_ros_planning::moveit_planning_pipeline
73+
moveit_ros_planning::moveit_planning_pipeline_interfaces
74+
moveit_ros_planning::moveit_planning_scene_monitor
75+
moveit_ros_planning::moveit_rdf_loader
76+
moveit_ros_planning::moveit_robot_model_loader
77+
moveit_ros_planning::moveit_trajectory_execution_manager
78+
moveit_ros_planning::planning_pipeline_parameters
79+
moveit_ros_planning::srdf_publisher_node
80+
rclcpp::rclcpp
81+
rviz_visual_tools::rviz_visual_tools
82+
rviz_visual_tools::rviz_visual_tools_gui
83+
rviz_visual_tools::rviz_visual_tools_imarker_simple
84+
rviz_visual_tools::rviz_visual_tools_remote_control
85+
tf2_eigen::tf2_eigen
86+
tf2_ros::static_transform_broadcaster_node
87+
tf2_ros::tf2_ros
88+
)
89+
5090

5191
# Demo executable
5292
add_executable(${PROJECT_NAME}_demo
@@ -55,12 +95,11 @@ add_executable(${PROJECT_NAME}_demo
5595
target_link_libraries(${PROJECT_NAME}_demo
5696
${PROJECT_NAME}
5797
)
58-
ament_target_dependencies(${PROJECT_NAME}_demo ${THIS_PACKAGE_INCLUDE_DEPENDS})
5998

6099

61100
# Exports
62101
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
63-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
102+
64103

65104
#############
66105
## Install ##

0 commit comments

Comments
 (0)