Skip to content

Commit 66fc57b

Browse files
mergify[bot]FranzAlbersahcorde
authored
Correctly export dependencies for downstream packages (backport #70) (#71)
(cherry picked from commit e33a5e9) Signed-off-by: Alejandro Hernandez Cordero <[email protected]> Co-authored-by: Albers Franz <[email protected]> Co-authored-by: Alejandro Hernandez Cordero <[email protected]>
1 parent 4752847 commit 66fc57b

File tree

4 files changed

+39
-15
lines changed

4 files changed

+39
-15
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

@@ -37,7 +37,13 @@ add_library(${PROJECT_NAME}
3737
)
3838

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

4349
# draco 1.5.3 dropped the DRACO_LIBRARIES variable in favor of

plugin_template/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO (YourNameHere): This is not a working CMake Project!
1+
# TODO (YourNameHere): This is not a working CMake Project!
22
# Some assembly required for your plugin. (-:
33

44
cmake_minimum_required(VERSION 3.10.2)
@@ -31,7 +31,12 @@ add_library(${PROJECT_NAME}
3131
src/template_subscriber.cpp
3232
)
3333

34-
ament_target_dependencies(${PROJECT_NAME} ${dependencies})
34+
target_link_libraries(${PROJECT_NAME} PRIVATE
35+
pluginlib::pluginlib
36+
${point_cloud_interfaces_TARGETS}
37+
point_cloud_transport::point_cloud_transport
38+
rclcpp::rclcpp
39+
)
3540

3641
install(TARGETS ${PROJECT_NAME}
3742
ARCHIVE DESTINATION lib

zlib_point_cloud_transport/CMakeLists.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,18 @@ add_library(${PROJECT_NAME}
2929
src/manifest.cpp
3030
)
3131

32-
target_link_libraries(${PROJECT_NAME} ZLIB::ZLIB)
32+
target_link_libraries(${PROJECT_NAME} PRIVATE
33+
pluginlib::pluginlib
34+
${point_cloud_interfaces_TARGETS}
35+
point_cloud_transport::point_cloud_transport
36+
rclcpp::rclcpp
37+
ZLIB::ZLIB
38+
)
3339

34-
ament_target_dependencies(${PROJECT_NAME} ${dependencies})
40+
target_include_directories(${PROJECT_NAME} PRIVATE
41+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
42+
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
43+
)
3544

3645
install(TARGETS ${PROJECT_NAME}
3746
ARCHIVE DESTINATION lib

zstd_point_cloud_transport/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@ add_library(${PROJECT_NAME}
2626
src/manifest.cpp
2727
)
2828

29-
target_link_libraries(${PROJECT_NAME} zstd)
30-
31-
ament_target_dependencies(${PROJECT_NAME} ${dependencies})
29+
target_link_libraries(${PROJECT_NAME} PRIVATE
30+
pluginlib::pluginlib
31+
${point_cloud_interfaces_TARGETS}
32+
point_cloud_transport::point_cloud_transport
33+
rclcpp::rclcpp
34+
zstd
35+
)
3236

3337
install(TARGETS ${PROJECT_NAME}
3438
ARCHIVE DESTINATION lib

0 commit comments

Comments
 (0)