Skip to content

Commit e33a5e9

Browse files
authored
Correctly export dependencies for downstream packages (#70)
1 parent e0efb00 commit e33a5e9

File tree

4 files changed

+39
-23
lines changed

4 files changed

+39
-23
lines changed

draco_point_cloud_transport/CMakeLists.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ find_package(std_msgs REQUIRED)
1616
find_package(Draco REQUIRED)
1717

1818
set(dependencies
19-
pluginlib::pluginlib
20-
${point_cloud_interfaces_TARGETS}
21-
point_cloud_transport::point_cloud_transport
22-
rclcpp::rclcpp
23-
rcpputils::rcpputils
24-
${sensor_msgs_TARGETS}
25-
${std_msgs_TARGETS}
19+
pluginlib
20+
point_cloud_interfaces
21+
point_cloud_transport
22+
rclcpp
23+
rcpputils
24+
sensor_msgs
25+
std_msgs
2626
)
2727

2828
include_directories(include)
@@ -36,7 +36,13 @@ add_library(${PROJECT_NAME}
3636
)
3737

3838
target_link_libraries(${PROJECT_NAME} PRIVATE
39-
${dependencies}
39+
pluginlib::pluginlib
40+
${point_cloud_interfaces_TARGETS}
41+
point_cloud_transport::point_cloud_transport
42+
rclcpp::rclcpp
43+
rcpputils::rcpputils
44+
${sensor_msgs_TARGETS}
45+
${std_msgs_TARGETS}
4046
)
4147

4248
# draco 1.5.3 dropped the DRACO_LIBRARIES variable in favor of

plugin_template/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ find_package(rclcpp REQUIRED)
1515
# TODO (YourNameHere): You might need more dependencies
1616

1717
set(dependencies
18-
pluginlib::pluginlib
19-
${point_cloud_interfaces_TARGETS}
20-
point_cloud_transport::point_cloud_transport
21-
rclcpp::rclcpp
18+
pluginlib
19+
point_cloud_interfaces
20+
point_cloud_transport
21+
rclcpp
2222
)
2323

2424
target_include_directories(${PROJECT_NAME} PRIVATE
@@ -34,7 +34,10 @@ add_library(${PROJECT_NAME}
3434
)
3535

3636
target_link_libraries(${PROJECT_NAME} PRIVATE
37-
${dependencies}
37+
pluginlib::pluginlib
38+
${point_cloud_interfaces_TARGETS}
39+
point_cloud_transport::point_cloud_transport
40+
rclcpp::rclcpp
3841
)
3942

4043
install(TARGETS ${PROJECT_NAME}

zlib_point_cloud_transport/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ find_package(rclcpp REQUIRED)
1212
find_package(ZLIB REQUIRED)
1313

1414
set(dependencies
15-
pluginlib::pluginlib
16-
${point_cloud_interfaces_TARGETS}
17-
point_cloud_transport::point_cloud_transport
18-
rclcpp::rclcpp
15+
pluginlib
16+
point_cloud_interfaces
17+
point_cloud_transport
18+
rclcpp
1919
)
2020

2121
add_library(${PROJECT_NAME}
@@ -27,9 +27,13 @@ add_library(${PROJECT_NAME}
2727
)
2828

2929
target_link_libraries(${PROJECT_NAME} PRIVATE
30+
pluginlib::pluginlib
31+
${point_cloud_interfaces_TARGETS}
32+
point_cloud_transport::point_cloud_transport
33+
rclcpp::rclcpp
3034
ZLIB::ZLIB
31-
${dependencies}
3235
)
36+
3337
target_include_directories(${PROJECT_NAME} PRIVATE
3438
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
3539
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"

zstd_point_cloud_transport/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ find_package(point_cloud_transport REQUIRED)
1111
find_package(rclcpp REQUIRED)
1212

1313
set(dependencies
14-
pluginlib::pluginlib
15-
${point_cloud_interfaces_TARGETS}
16-
point_cloud_transport::point_cloud_transport
17-
rclcpp::rclcpp
14+
pluginlib
15+
point_cloud_interfaces
16+
point_cloud_transport
17+
rclcpp
1818
)
1919

2020
add_library(${PROJECT_NAME}
@@ -25,8 +25,11 @@ add_library(${PROJECT_NAME}
2525
)
2626

2727
target_link_libraries(${PROJECT_NAME} PRIVATE
28+
pluginlib::pluginlib
29+
${point_cloud_interfaces_TARGETS}
30+
point_cloud_transport::point_cloud_transport
31+
rclcpp::rclcpp
2832
zstd
29-
${dependencies}
3033
)
3134

3235
target_include_directories(${PROJECT_NAME} PRIVATE

0 commit comments

Comments
 (0)