Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replace expected in third party with ros package (backport #32) #33

Merged
merged 1 commit into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions point_cloud_transport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ find_package(pluginlib REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_components REQUIRED)
find_package(sensor_msgs REQUIRED)

include_directories(
include
)

# Tell CMake where to find the ThirdParty expected dependency
set(expected_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/expected")
find_package(tl_expected REQUIRED)

# Build libpoint_cloud_transport
add_library(${PROJECT_NAME}
Expand All @@ -42,12 +36,12 @@ add_library(${PROJECT_NAME}
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
target_include_directories(${PROJECT_NAME} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
"$<BUILD_INTERFACE:${expected_SOURCE_DIR}/include>")
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME} PUBLIC
message_filters::message_filters
rclcpp::rclcpp
${sensor_msgs_TARGETS})
${sensor_msgs_TARGETS}
tl_expected::tl_expected)
target_link_libraries(${PROJECT_NAME} PRIVATE
pluginlib::pluginlib)

Expand Down Expand Up @@ -75,8 +69,7 @@ ament_target_dependencies(republish_node
)
target_include_directories(republish_node PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
"$<BUILD_INTERFACE:${expected_SOURCE_DIR}/include>")
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
rclcpp_components_register_nodes(republish_node "point_cloud_transport::Republisher")

add_executable(republish
Expand Down Expand Up @@ -118,20 +111,15 @@ install(
)

# Install include directories
install(DIRECTORY include/ ${expected_SOURCE_DIR}/include/ DESTINATION include/${PROJECT_NAME})
install(DIRECTORY include/ DESTINATION include/${PROJECT_NAME})

ament_export_include_directories("include/${PROJECT_NAME}")

ament_export_targets(export_${PROJECT_NAME})

ament_export_dependencies(message_filters rclcpp sensor_msgs pluginlib)
ament_export_dependencies(message_filters rclcpp sensor_msgs pluginlib tl_expected)

if(BUILD_TESTING)
set(
_linter_excludes
${expected_SOURCE_DIR}/include/tl/expected.hpp
)

find_package(ament_cmake_copyright REQUIRED)
find_package(ament_cmake_cppcheck REQUIRED)
find_package(ament_cmake_cpplint REQUIRED)
Expand Down
121 changes: 0 additions & 121 deletions point_cloud_transport/ThirdParty/expected/COPYING

This file was deleted.

76 changes: 0 additions & 76 deletions point_cloud_transport/ThirdParty/expected/README.md

This file was deleted.

Loading
Loading