Skip to content

Commit 08b82f3

Browse files
clalancetteahcorde
authored andcommitted
Rename the republish_node to pc_republish_node. (#75)
The major reason for this is that image_transport already has a republish_node, and when we are building for distribution we can't have two files named /opt/ros/rolling/lib/librepublish_node.so Rename this one to libpc_republish_node, which should remove the conflict. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 756c41f commit 08b82f3

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

point_cloud_transport/CMakeLists.txt

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,36 +57,34 @@ target_link_libraries(${PROJECT_NAME}_plugins PRIVATE
5757
${PROJECT_NAME}
5858
pluginlib::pluginlib)
5959

60-
add_library(republish_node SHARED src/republish.cpp)
61-
target_link_libraries(republish_node
60+
add_library(pc_republish_node SHARED src/republish.cpp)
61+
target_link_libraries(pc_republish_node PRIVATE
6262
${PROJECT_NAME}
63+
pluginlib::pluginlib
64+
rclcpp_components::component
65+
rclcpp::rclcpp
6366
)
64-
target_compile_definitions(republish_node PRIVATE "POINT_CLOUD_TRANSPORT_BUILDING_DLL")
65-
ament_target_dependencies(republish_node
66-
pluginlib
67-
rclcpp_components
68-
rclcpp
69-
)
70-
target_include_directories(republish_node PUBLIC
67+
target_compile_definitions(pc_republish_node PRIVATE "POINT_CLOUD_TRANSPORT_BUILDING_DLL")
68+
target_include_directories(pc_republish_node PRIVATE
7169
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
7270
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
73-
rclcpp_components_register_nodes(republish_node "point_cloud_transport::Republisher")
71+
rclcpp_components_register_nodes(pc_republish_node "point_cloud_transport::Republisher")
7472

75-
rclcpp_components_register_node(republish_node
73+
rclcpp_components_register_node(pc_republish_node
7674
PLUGIN "point_cloud_transport::Republisher"
7775
EXECUTABLE republish
7876
)
7977

8078
# Build list_transports
8179
add_executable(list_transports src/list_transports.cpp)
82-
target_link_libraries(list_transports
80+
target_link_libraries(list_transports PRIVATE
8381
${PROJECT_NAME}
8482
pluginlib::pluginlib)
8583

8684
# Install plugin descriptions
8785
pluginlib_export_plugin_description_file(${PROJECT_NAME} default_plugins.xml)
8886

89-
install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_plugins republish_node
87+
install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_plugins pc_republish_node
9088
ARCHIVE DESTINATION lib
9189
LIBRARY DESTINATION lib
9290
RUNTIME DESTINATION bin

point_cloud_transport/include/point_cloud_transport/point_cloud_transport.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
#include <sensor_msgs/msg/point_cloud2.hpp>
4444

45+
#include <point_cloud_transport/loader_fwds.hpp>
4546
#include <point_cloud_transport/publisher.hpp>
4647
#include <point_cloud_transport/single_subscriber_publisher.hpp>
4748
#include <point_cloud_transport/subscriber.hpp>

0 commit comments

Comments
 (0)