Skip to content

Commit 983072b

Browse files
evan-palmerevan-palmer
committed
cleanup
1 parent 2ce9865 commit 983072b

File tree

7 files changed

+137
-107
lines changed

7 files changed

+137
-107
lines changed

‎controller_common/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ install(
3737
)
3838

3939
ament_export_targets(export_controller_common HAS_LIBRARY_TARGET)
40-
ament_export_dependencies(rclcpp geometry_msgs nav_msgs)
40+
ament_export_dependencies("rclcpp" "geometry_msgs" "nav_msgs")
4141

4242
ament_package()

‎ik_solvers/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,13 @@ endif()
77

88
include(GNUInstallDirs)
99

10-
set(THIS_PACKAGE_INCLUDE_DEPENDS
11-
rclcpp
12-
rclcpp_lifecycle
13-
pluginlib
14-
Eigen3
15-
pinocchio
16-
trajectory_msgs
17-
tf2_eigen
18-
)
19-
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
20-
find_package(${Dependency} REQUIRED)
21-
endforeach()
22-
10+
find_package(rclcpp REQUIRED)
11+
find_package(rclcpp_lifecycle REQUIRED)
12+
find_package(pluginlib REQUIRED)
13+
find_package(Eigen3 REQUIRED)
14+
find_package(pinocchio REQUIRED)
15+
find_package(trajectory_msgs REQUIRED)
16+
find_package(tf2_eigen REQUIRED)
2317
find_package(ament_cmake REQUIRED)
2418
find_package(ament_cmake_ros REQUIRED)
2519
find_package(generate_parameter_library REQUIRED)
@@ -39,7 +33,6 @@ target_sources(
3933
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
4034
FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ik_solvers/solver.hpp
4135
)
42-
# ament_target_dependencies(solver_base PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
4336
target_link_libraries(
4437
solver_base
4538
PUBLIC
@@ -63,7 +56,6 @@ target_sources(
6356
FILES
6457
${CMAKE_CURRENT_SOURCE_DIR}/include/ik_solvers/task_priority_solver.hpp
6558
)
66-
# ament_target_dependencies(ik_solvers PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
6759
target_compile_features(ik_solvers PUBLIC cxx_std_23)
6860
target_link_libraries(
6961
ik_solvers
@@ -92,6 +84,14 @@ install(
9284
)
9385

9486
ament_export_targets(export_ik_solvers)
95-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
87+
ament_export_dependencies(
88+
"rclcpp"
89+
"rclcpp_lifecycle"
90+
"pluginlib"
91+
"Eigen3"
92+
"pinocchio"
93+
"trajectory_msgs"
94+
"tf2_eigen"
95+
)
9696

9797
ament_package()

‎thruster_allocation_matrix_controller/CMakeLists.txt

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@ endif()
77

88
include(GNUInstallDirs)
99

10-
set(THIS_PACKAGE_INCLUDE_DEPENDS
11-
rclcpp
12-
rclcpp_lifecycle
13-
controller_interface
14-
hardware_interface
15-
realtime_tools
16-
Eigen3
17-
geometry_msgs
18-
auv_control_msgs
19-
control_msgs
20-
hydrodynamics
21-
controller_common
22-
)
23-
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
24-
find_package(${Dependency} REQUIRED)
25-
endforeach()
26-
10+
find_package(rclcpp REQUIRED)
11+
find_package(rclcpp_lifecycle REQUIRED)
12+
find_package(controller_interface REQUIRED)
13+
find_package(hardware_interface REQUIRED)
14+
find_package(realtime_tools REQUIRED)
15+
find_package(Eigen3 REQUIRED)
16+
find_package(geometry_msgs REQUIRED)
17+
find_package(auv_control_msgs REQUIRED)
18+
find_package(control_msgs REQUIRED)
19+
find_package(hydrodynamics REQUIRED)
20+
find_package(controller_common REQUIRED)
2721
find_package(ament_cmake REQUIRED)
2822
find_package(generate_parameter_library REQUIRED)
2923
find_package(pluginlib REQUIRED)
@@ -76,6 +70,18 @@ install(
7670
)
7771

7872
ament_export_targets(export_thruster_allocation_matrix_controller HAS_LIBRARY_TARGET)
79-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
73+
ament_export_dependencies(
74+
"rclcpp"
75+
"rclcpp_lifecycle"
76+
"controller_interface"
77+
"hardware_interface"
78+
"realtime_tools"
79+
"Eigen3"
80+
"geometry_msgs"
81+
"auv_control_msgs"
82+
"control_msgs"
83+
"hydrodynamics"
84+
"controller_common"
85+
)
8086

8187
ament_package()

‎thruster_controllers/CMakeLists.txt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,13 @@ endif()
77

88
include(GNUInstallDirs)
99

10-
set(THIS_PACKAGE_INCLUDE_DEPENDS
11-
controller_interface
12-
hardware_interface
13-
rclcpp
14-
rclcpp_lifecycle
15-
realtime_tools
16-
std_msgs
17-
control_msgs
18-
)
19-
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
20-
find_package(${Dependency} REQUIRED)
21-
endforeach()
22-
10+
find_package(controller_interface REQUIRED)
11+
find_package(hardware_interface REQUIRED)
12+
find_package(rclcpp REQUIRED)
13+
find_package(rclcpp_lifecycle REQUIRED)
14+
find_package(realtime_tools REQUIRED)
15+
find_package(std_msgs REQUIRED)
16+
find_package(control_msgs REQUIRED)
2317
find_package(ament_cmake REQUIRED)
2418
find_package(generate_parameter_library REQUIRED)
2519
find_package(pluginlib REQUIRED)
@@ -81,6 +75,14 @@ install(
8175
)
8276

8377
ament_export_targets(export_thruster_controllers HAS_LIBRARY_TARGET)
84-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
78+
ament_export_dependencies(
79+
"controller_interface"
80+
"hardware_interface"
81+
"rclcpp"
82+
"rclcpp_lifecycle"
83+
"realtime_tools"
84+
"std_msgs"
85+
"control_msgs"
86+
)
8587

8688
ament_package()

‎topic_sensors/CMakeLists.txt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,13 @@ endif()
77

88
include(GNUInstallDirs)
99

10-
set(THIS_PACKAGE_INCLUDE_DEPENDS
11-
hardware_interface
12-
rclcpp
13-
realtime_tools
14-
std_msgs
15-
nav_msgs
16-
controller_common
17-
message_transforms
18-
)
19-
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
20-
find_package(${Dependency} REQUIRED)
21-
endforeach()
22-
10+
find_package(hardware_interface REQUIRED)
11+
find_package(rclcpp REQUIRED)
12+
find_package(realtime_tools REQUIRED)
13+
find_package(std_msgs REQUIRED)
14+
find_package(nav_msgs REQUIRED)
15+
find_package(controller_common REQUIRED)
16+
find_package(message_transforms REQUIRED)
2317
find_package(ament_cmake REQUIRED)
2418
find_package(pluginlib REQUIRED)
2519

@@ -57,6 +51,14 @@ install(
5751
)
5852

5953
ament_export_targets(export_topic_sensors HAS_LIBRARY_TARGET)
60-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
54+
ament_export_dependencies(
55+
"hardware_interface"
56+
"rclcpp"
57+
"realtime_tools"
58+
"std_msgs"
59+
"nav_msgs"
60+
"controller_common"
61+
"message_transforms"
62+
)
6163

6264
ament_package()

‎velocity_controllers/CMakeLists.txt

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,20 @@ endif()
77

88
include(GNUInstallDirs)
99

10-
set(THIS_PACKAGE_INCLUDE_DEPENDS
11-
controller_interface
12-
hardware_interface
13-
rclcpp
14-
rclcpp_lifecycle
15-
realtime_tools
16-
Eigen3
17-
hydrodynamics
18-
geometry_msgs
19-
control_msgs
20-
tf2_eigen
21-
tf2
22-
tf2_ros
23-
nav_msgs
24-
controller_common
25-
)
26-
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
27-
find_package(${Dependency} REQUIRED)
28-
endforeach()
29-
10+
find_package(controller_interface REQUIRED)
11+
find_package(hardware_interface REQUIRED)
12+
find_package(rclcpp REQUIRED)
13+
find_package(rclcpp_lifecycle REQUIRED)
14+
find_package(realtime_tools REQUIRED)
15+
find_package(Eigen3 REQUIRED)
16+
find_package(hydrodynamics REQUIRED)
17+
find_package(geometry_msgs REQUIRED)
18+
find_package(control_msgs REQUIRED)
19+
find_package(tf2_eigen REQUIRED)
20+
find_package(tf2 REQUIRED)
21+
find_package(tf2_ros REQUIRED)
22+
find_package(nav_msgs REQUIRED)
23+
find_package(controller_common REQUIRED)
3024
find_package(ament_cmake REQUIRED)
3125
find_package(generate_parameter_library REQUIRED)
3226
find_package(pluginlib REQUIRED)
@@ -90,6 +84,21 @@ install(
9084
)
9185

9286
ament_export_targets(export_velocity_controllers HAS_LIBRARY_TARGET)
93-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
87+
ament_export_dependencies(
88+
"controller_interface"
89+
"hardware_interface"
90+
"rclcpp"
91+
"rclcpp_lifecycle"
92+
"realtime_tools"
93+
"Eigen3"
94+
"hydrodynamics"
95+
"geometry_msgs"
96+
"control_msgs"
97+
"tf2_eigen"
98+
"tf2"
99+
"tf2_ros"
100+
"nav_msgs"
101+
"controller_common"
102+
)
94103

95104
ament_package()

‎whole_body_controllers/CMakeLists.txt

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,22 @@ endif()
77

88
include(GNUInstallDirs)
99

10-
set(THIS_PACKAGE_INCLUDE_DEPENDS
11-
controller_interface
12-
hardware_interface
13-
rclcpp
14-
rclcpp_lifecycle
15-
realtime_tools
16-
nav_msgs
17-
std_msgs
18-
control_msgs
19-
pinocchio
20-
geometry_msgs
21-
tf2_ros
22-
tf2_eigen
23-
message_transforms
24-
controller_common
25-
ik_solvers
26-
auv_control_msgs
27-
)
28-
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
29-
find_package(${Dependency} REQUIRED)
30-
endforeach()
31-
10+
find_package(controller_interface REQUIRED)
11+
find_package(hardware_interface REQUIRED)
12+
find_package(rclcpp REQUIRED)
13+
find_package(rclcpp_lifecycle REQUIRED)
14+
find_package(realtime_tools REQUIRED)
15+
find_package(nav_msgs REQUIRED)
16+
find_package(std_msgs REQUIRED)
17+
find_package(control_msgs REQUIRED)
18+
find_package(pinocchio REQUIRED)
19+
find_package(geometry_msgs REQUIRED)
20+
find_package(tf2_ros REQUIRED)
21+
find_package(tf2_eigen REQUIRED)
22+
find_package(message_transforms REQUIRED)
23+
find_package(controller_common REQUIRED)
24+
find_package(ik_solvers REQUIRED)
25+
find_package(auv_control_msgs REQUIRED)
3226
find_package(ament_cmake REQUIRED)
3327
find_package(generate_parameter_library REQUIRED)
3428
find_package(pluginlib REQUIRED)
@@ -81,6 +75,23 @@ install(
8175
)
8276

8377
ament_export_targets(export_whole_body_controllers HAS_LIBRARY_TARGET)
84-
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
78+
ament_export_dependencies(
79+
"controller_interface"
80+
"hardware_interface"
81+
"rclcpp"
82+
"rclcpp_lifecycle"
83+
"realtime_tools"
84+
"nav_msgs"
85+
"std_msgs"
86+
"control_msgs"
87+
"pinocchio"
88+
"geometry_msgs"
89+
"tf2_ros"
90+
"tf2_eigen"
91+
"message_transforms"
92+
"controller_common"
93+
"ik_solvers"
94+
"auv_control_msgs"
95+
)
8596

8697
ament_package()

0 commit comments

Comments
 (0)