Skip to content

Commit

Permalink
Rename the republish_node to pc_republish_node. (#75) (#77)
Browse files Browse the repository at this point in the history
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]>
Co-authored-by: Chris Lalancette <[email protected]>
  • Loading branch information
ahcorde and clalancette authored Apr 2, 2024
1 parent 756c41f commit e492975
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
24 changes: 11 additions & 13 deletions point_cloud_transport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,36 +57,34 @@ target_link_libraries(${PROJECT_NAME}_plugins PRIVATE
${PROJECT_NAME}
pluginlib::pluginlib)

add_library(republish_node SHARED src/republish.cpp)
target_link_libraries(republish_node
add_library(pc_republish_node SHARED src/republish.cpp)
target_link_libraries(pc_republish_node PRIVATE
${PROJECT_NAME}
pluginlib::pluginlib
rclcpp_components::component
rclcpp::rclcpp
)
target_compile_definitions(republish_node PRIVATE "POINT_CLOUD_TRANSPORT_BUILDING_DLL")
ament_target_dependencies(republish_node
pluginlib
rclcpp_components
rclcpp
)
target_include_directories(republish_node PUBLIC
target_compile_definitions(pc_republish_node PRIVATE "POINT_CLOUD_TRANSPORT_BUILDING_DLL")
target_include_directories(pc_republish_node PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
rclcpp_components_register_nodes(republish_node "point_cloud_transport::Republisher")
rclcpp_components_register_nodes(pc_republish_node "point_cloud_transport::Republisher")

rclcpp_components_register_node(republish_node
rclcpp_components_register_node(pc_republish_node
PLUGIN "point_cloud_transport::Republisher"
EXECUTABLE republish
)

# Build list_transports
add_executable(list_transports src/list_transports.cpp)
target_link_libraries(list_transports
target_link_libraries(list_transports PRIVATE
${PROJECT_NAME}
pluginlib::pluginlib)

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

install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_plugins republish_node
install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_plugins pc_republish_node
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

#include <sensor_msgs/msg/point_cloud2.hpp>

#include <point_cloud_transport/loader_fwds.hpp>
#include <point_cloud_transport/publisher.hpp>
#include <point_cloud_transport/single_subscriber_publisher.hpp>
#include <point_cloud_transport/subscriber.hpp>
Expand Down

0 comments on commit e492975

Please sign in to comment.