Skip to content

Commit 647fa9b

Browse files
DangitBenDangitBen
authored
Dependency cleanup (#774)
1 parent 6b0db97 commit 647fa9b

File tree

13 files changed

+49
-87
lines changed

13 files changed

+49
-87
lines changed

‎swri_console_util/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,18 @@ target_link_libraries(${PROJECT_NAME}
1313
target_include_directories(${PROJECT_NAME}
1414
PUBLIC
1515
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
16-
$<INSTALL_INTERFACE:include>)
16+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
1717

1818
install(DIRECTORY include/
19-
DESTINATION include)
19+
DESTINATION include/${PROJECT_NAME})
2020

2121
install(TARGETS ${PROJECT_NAME}
2222
EXPORT export_${PROJECT_NAME}
2323
RUNTIME DESTINATION bin
2424
LIBRARY DESTINATION lib
2525
ARCHIVE DESTINATION lib)
2626

27-
ament_export_dependencies(ament_cmake
28-
rclcpp)
29-
3027
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
31-
ament_export_include_directories(include)
3228
ament_export_dependencies(rclcpp)
3329

3430
ament_package()

‎swri_dbw_interface/CMakeLists.txt‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,20 @@ set(CMAKE_CXX_STANDARD 17)
55

66
find_package(ament_cmake REQUIRED)
77

8+
add_library(${PROJECT_NAME} INTERFACE)
9+
target_include_directories(${PROJECT_NAME} INTERFACE
10+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
11+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
12+
813
install(DIRECTORY include/
9-
DESTINATION include)
14+
DESTINATION include/${PROJECT_NAME})
1015

11-
ament_export_dependencies(ament_cmake)
16+
install(TARGETS ${PROJECT_NAME}
17+
EXPORT export_${PROJECT_NAME}
18+
ARCHIVE DESTINATION lib
19+
LIBRARY DESTINATION lib
20+
RUNTIME DESTINATION bin
21+
)
1222

23+
ament_export_targets(export_${PROJECT_NAME})
1324
ament_package()

‎swri_geometry_util/CMakeLists.txt‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ project(swri_geometry_util)
55
set(CMAKE_CXX_STANDARD 17)
66

77
find_package(ament_cmake REQUIRED)
8-
find_package(cv_bridge REQUIRED)
98
find_package(Eigen3 REQUIRED)
109
find_package(GEOS REQUIRED)
1110
find_package(OpenCV REQUIRED core)
12-
find_package(rclcpp REQUIRED)
1311
find_package(tf2 REQUIRED)
1412

15-
#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
16-
1713
add_library(${PROJECT_NAME} SHARED
1814
src/cubic_spline.cpp
1915
src/geometry_util.cpp
@@ -22,15 +18,13 @@ add_library(${PROJECT_NAME} SHARED
2218

2319
target_include_directories(${PROJECT_NAME} PUBLIC
2420
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
25-
$<INSTALL_INTERFACE:include>)
21+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
2622

2723
target_link_libraries(${PROJECT_NAME} PUBLIC
28-
cv_bridge::cv_bridge
2924
geos_c
30-
Eigen3::Eigen
3125
opencv_core
32-
rclcpp::rclcpp
3326
tf2::tf2)
27+
target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen)
3428

3529
if(BUILD_TESTING)
3630
find_package(ament_cmake_gtest REQUIRED)
@@ -43,18 +37,15 @@ if(BUILD_TESTING)
4337
endif()
4438

4539
install(DIRECTORY include/
46-
DESTINATION include)
40+
DESTINATION include/${PROJECT_NAME})
4741

4842
install(TARGETS ${PROJECT_NAME}
4943
EXPORT export_${PROJECT_NAME}
5044
RUNTIME DESTINATION bin
5145
LIBRARY DESTINATION lib
5246
ARCHIVE DESTINATION lib)
5347

54-
ament_export_targets(export_${PROJECT_NAME})
55-
ament_export_dependencies(ament_cmake)
56-
ament_export_dependencies(rclcpp)
57-
ament_export_dependencies(cv_bridge)
48+
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
5849
ament_export_dependencies(tf2)
5950

6051
ament_package()

‎swri_geometry_util/package.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
TODO pjr Is there a ROS2 equivalent for this? Do we still need it?
1919
<depend>cmake_modules</depend>
2020
-->
21-
<depend>cv_bridge</depend>
2221
<depend>eigen</depend>
2322
<depend>geos</depend>
24-
<depend>rclcpp</depend>
2523
<depend>tf2</depend>
2624

2725
<test_depend>ament_cmake_gtest</test_depend>

‎swri_image_util/CMakeLists.txt‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@ set(CMAKE_CXX_STANDARD 17)
55

66
find_package(ament_cmake REQUIRED)
77
find_package(ament_index_cpp REQUIRED)
8-
find_package(camera_calibration_parsers REQUIRED)
98
find_package(cv_bridge REQUIRED)
109
find_package(Eigen3 REQUIRED)
11-
find_package(geometry_msgs REQUIRED)
12-
find_package(image_geometry REQUIRED)
1310
find_package(image_transport REQUIRED)
1411
find_package(message_filters REQUIRED)
15-
find_package(nav_msgs REQUIRED)
1612
find_package(OpenCV REQUIRED core highgui imgproc stitching)
1713
find_package(rcl_interfaces REQUIRED)
1814
find_package(rclcpp REQUIRED)
1915
find_package(rclcpp_components REQUIRED)
2016
find_package(rclpy REQUIRED)
21-
find_package(std_msgs REQUIRED)
2217
find_package(swri_geometry_util REQUIRED)
23-
find_package(swri_math_util REQUIRED)
2418
find_package(swri_opencv_util REQUIRED)
25-
find_package(swri_roscpp REQUIRED)
2619
find_package(tf2 REQUIRED)
2720

2821
add_definitions(${EIGEN3_DEFINITIONS})
@@ -40,28 +33,17 @@ target_include_directories(${PROJECT_NAME}
4033
PUBLIC
4134
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
4235
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
43-
PRIVATE
44-
${swri_roscpp_TARGETS}
4536
)
4637

4738
target_link_libraries(${PROJECT_NAME} PUBLIC
48-
${geometry_msgs_TARGETS}
49-
${nav_msgs_TARGETS}
50-
${std_msgs_TARGETS}
51-
${swri_geometry_util_TARGETS}
5239
${swri_opencv_util_TARGETS}
53-
camera_calibration_parsers::camera_calibration_parsers
54-
cv_bridge::cv_bridge
55-
Eigen3::Eigen
5640
opencv_core
5741
opencv_highgui
5842
opencv_imgproc
5943
opencv_stitching
60-
${rcl_interfaces_TARGETS}
6144
rclcpp::rclcpp
62-
rclcpp_components::component
63-
rclcpp_components::component_manager
6445
tf2::tf2)
46+
target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen ${swri_geometry_util_TARGETS})
6547

6648
add_library(${PROJECT_NAME}_nodes SHARED
6749
src/nodes/blend_images_node.cpp
@@ -94,13 +76,16 @@ rclcpp_components_register_nodes(${PROJECT_NAME}_nodes "swri_image_util::RotateI
9476
rclcpp_components_register_nodes(${PROJECT_NAME}_nodes "swri_image_util::ScaleImageNode")
9577
rclcpp_components_register_nodes(${PROJECT_NAME}_nodes "swri_image_util::WarpImageNode")
9678

97-
target_link_libraries(${PROJECT_NAME}_nodes
98-
PUBLIC
79+
target_link_libraries(${PROJECT_NAME}_nodes PRIVATE
9980
${PROJECT_NAME}
10081
ament_index_cpp::ament_index_cpp
82+
cv_bridge::cv_bridge
10183
image_transport::image_transport
102-
PRIVATE
103-
message_filters::message_filters)
84+
message_filters::message_filters
85+
rclcpp_components::component
86+
rclcpp_components::component_manager
87+
${rcl_interfaces_TARGETS}
88+
)
10489

10590
# Iron and later switched some cv_bridge files to .hpp from .h
10691
if ("${cv_bridge_VERSION}" VERSION_LESS "3.3.0")
@@ -128,9 +113,7 @@ install(TARGETS ${PROJECT_NAME}_nodes
128113
ARCHIVE DESTINATION lib)
129114

130115
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
131-
ament_export_dependencies(ament_cmake
132-
camera_calibration_parsers
133-
OpenCV
116+
ament_export_dependencies(OpenCV
134117
rclcpp
135118
swri_opencv_util
136119
tf2

‎swri_image_util/package.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,16 @@
1818
<depend>camera_calibration_parsers</depend>
1919
<depend>cv_bridge</depend>
2020
<depend>eigen</depend>
21-
<depend>geometry_msgs</depend>
2221
<depend>image_geometry</depend>
2322
<depend>image_transport</depend>
2423
<depend>message_filters</depend>
25-
<depend>nav_msgs</depend>
2624
<depend>rcl_interfaces</depend>
2725
<depend>rclcpp</depend>
2826
<depend>rclcpp_components</depend>
2927
<depend>rclpy</depend>
30-
<depend>std_msgs</depend>
3128
<depend>swri_geometry_util</depend>
3229
<depend>swri_math_util</depend>
3330
<depend>swri_opencv_util</depend>
34-
<depend>swri_roscpp</depend>
3531
<depend>tf2</depend>
3632

3733
<test_depend>ament_cmake_gtest</test_depend>

‎swri_math_util/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ add_library(${PROJECT_NAME} SHARED
1515
target_include_directories(${PROJECT_NAME}
1616
PUBLIC
1717
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
18-
$<INSTALL_INTERFACE:include>)
18+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
1919

2020
target_link_libraries(${PROJECT_NAME} PUBLIC
2121
rclcpp::rclcpp)
@@ -34,7 +34,7 @@ if(BUILD_TESTING)
3434
endif()
3535

3636
install(DIRECTORY include/
37-
DESTINATION include)
37+
DESTINATION include/${PROJECT_NAME})
3838

3939
install(TARGETS ${PROJECT_NAME}
4040
EXPORT export_${PROJECT_NAME}

‎swri_opencv_util/CMakeLists.txt‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ project(swri_opencv_util)
44
set(CMAKE_CXX_STANDARD 17)
55

66
find_package(ament_cmake REQUIRED)
7-
find_package(cv_bridge REQUIRED)
87
find_package(OpenCV REQUIRED core imgproc highgui)
98
find_package(swri_math_util REQUIRED)
109

@@ -17,28 +16,27 @@ add_library(${PROJECT_NAME} SHARED
1716

1817
target_include_directories(${PROJECT_NAME} PUBLIC
1918
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
20-
$<INSTALL_INTERFACE:include>)
19+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
2120

2221
target_link_libraries(${PROJECT_NAME} PUBLIC
2322
opencv_core
23+
${swri_math_util_TARGETS})
24+
target_link_libraries(${PROJECT_NAME} PRIVATE
2425
opencv_highgui
2526
opencv_imgproc
26-
${swri_math_util_TARGETS})
27+
)
2728

2829
install(DIRECTORY include/
29-
DESTINATION include)
30+
DESTINATION include/${PROJECT_NAME})
3031

3132
install(TARGETS ${PROJECT_NAME}
3233
EXPORT export_${PROJECT_NAME}
3334
RUNTIME DESTINATION bin
3435
LIBRARY DESTINATION lib
3536
ARCHIVE DESTINATION lib)
3637

37-
ament_export_targets(export_${PROJECT_NAME})
38-
ament_export_dependencies(ament_cmake)
39-
ament_export_dependencies(cv_bridge)
40-
ament_export_dependencies(OpenCV)
41-
ament_export_dependencies(swri_math_util)
38+
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
39+
ament_export_dependencies(ament_cmake OpenCV swri_math_util)
4240
ament_export_include_directories(include)
4341
ament_export_libraries(${PROJECT_NAME})
4442

‎swri_roscpp/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ install(DIRECTORY include/
3838
)
3939
install(TARGETS ${PROJECT_NAME}_library
4040
EXPORT export_${PROJECT_NAME}
41+
ARCHIVE DESTINATION lib
42+
LIBRARY DESTINATION lib
43+
RUNTIME DESTINATION bin
4144
)
4245

4346
# Export old-style CMake variables
@@ -69,11 +72,8 @@ install(DIRECTORY launch/
6972
ament_export_dependencies(ament_cmake
7073
diagnostic_msgs
7174
diagnostic_updater
72-
marti_common_msgs
73-
nav_msgs
7475
rclcpp
7576
std_msgs
76-
std_srvs
7777
)
7878

7979
ament_package(CONFIG_EXTRAS cmake/swri_roscpp-extras.cmake )

‎swri_route_util/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ find_package(marti_nav_msgs REQUIRED)
1010
find_package(rclcpp REQUIRED)
1111
find_package(swri_geometry_util REQUIRED)
1212
find_package(swri_math_util REQUIRED)
13-
find_package(swri_roscpp REQUIRED)
1413
find_package(swri_transform_util REQUIRED)
1514
find_package(tf2_geometry_msgs REQUIRED)
1615
find_package(visualization_msgs REQUIRED)
@@ -27,20 +26,18 @@ target_include_directories(${PROJECT_NAME}
2726
PUBLIC
2827
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
2928
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
30-
PRIVATE
31-
${swri_roscpp_TARGETS}
3229
)
3330

3431
target_link_libraries(${PROJECT_NAME} PUBLIC
3532
${geometry_msgs_TARGETS}
3633
${marti_common_msgs_TARGETS}
3734
${marti_nav_msgs_TARGETS}
38-
${swri_geometry_util_TARGETS}
3935
${swri_math_util_TARGETS}
4036
${swri_transform_util_TARGETS}
4137
${visualization_msgs_TARGETS}
4238
rclcpp::rclcpp
4339
tf2_geometry_msgs::tf2_geometry_msgs)
40+
target_link_libraries(${PROJECT_NAME} PRIVATE ${swri_geometry_util_TARGETS})
4441

4542
### Install Libraries and Executables ###
4643
install(TARGETS ${PROJECT_NAME}
@@ -57,7 +54,6 @@ ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
5754
ament_export_dependencies(ament_cmake
5855
geometry_msgs
5956
marti_nav_msgs
60-
swri_geometry_util
6157
swri_math_util
6258
swri_transform_util
6359
tf2

0 commit comments

Comments
 (0)