Skip to content

Use new ROSIDL aggregate CMake target #3105

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.

Sign up for GitHub

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

Open
emersonknapp wants to merge 1 commit into
base: rolling
Choose a base branch
from
Open

Use new ROSIDL aggregate CMake target #3105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions rclcpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,20 +203,20 @@ target_include_directories(${PROJECT_NAME} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME} PUBLIC
${builtin_interfaces_TARGETS}
builtin_interfaces::builtin_interfaces
libstatistics_collector::libstatistics_collector
rcl::rcl
${rcl_interfaces_TARGETS}
rcl_interfaces::rcl_interfaces
rcl_yaml_param_parser::rcl_yaml_param_parser
rcpputils::rcpputils
rcutils::rcutils
rmw::rmw
${rosgraph_msgs_TARGETS}
rosgraph_msgs::rosgraph_msgs
rosidl_dynamic_typesupport::rosidl_dynamic_typesupport
rosidl_runtime_c::rosidl_runtime_c
rosidl_runtime_cpp::rosidl_runtime_cpp
rosidl_typesupport_cpp::rosidl_typesupport_cpp
${statistics_msgs_TARGETS}
statistics_msgs::statistics_msgs
tracetools::tracetools
${CMAKE_THREAD_LIBS_INIT}
)
Expand Down
6 changes: 3 additions & 3 deletions rclcpp/test/benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ find_package(performance_test_fixture REQUIRED)

add_performance_test(benchmark_client benchmark_client.cpp)
if(TARGET benchmark_client)
target_link_libraries(benchmark_client ${PROJECT_NAME} ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS})
target_link_libraries(benchmark_client ${PROJECT_NAME} rcl_interfaces::rcl_interfaces test_msgs::test_msgs)
endif()

add_performance_test(benchmark_executor benchmark_executor.cpp)
if(TARGET benchmark_executor)
target_link_libraries(benchmark_executor ${PROJECT_NAME} ${test_msgs_TARGETS})
target_link_libraries(benchmark_executor ${PROJECT_NAME} test_msgs::test_msgs)
endif()

add_performance_test(benchmark_init_shutdown benchmark_init_shutdown.cpp)
Expand All @@ -37,5 +37,5 @@ endif()

add_performance_test(benchmark_service benchmark_service.cpp)
if(TARGET benchmark_service)
target_link_libraries(benchmark_service ${PROJECT_NAME} ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS})
target_link_libraries(benchmark_service ${PROJECT_NAME} rcl_interfaces::rcl_interfaces test_msgs::test_msgs)
endif()
114 changes: 57 additions & 57 deletions rclcpp/test/rclcpp/CMakeLists.txt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions rclcpp_action/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ target_include_directories(${PROJECT_NAME}
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME} PUBLIC
${action_msgs_TARGETS}
action_msgs::action_msgs
rcl::rcl
rcl_action::rcl_action
rclcpp::rclcpp
Expand Down Expand Up @@ -92,7 +92,7 @@ if(BUILD_TESTING)
rcl_action::rcl_action
rclcpp::rclcpp
rcutils::rcutils
${test_msgs_TARGETS}
test_msgs::test_msgs
)
endif()

Expand All @@ -106,7 +106,7 @@ if(BUILD_TESTING)
rcl_action::rcl_action
rclcpp::rclcpp
rcutils::rcutils
${test_msgs_TARGETS}
test_msgs::test_msgs
)
endif()

Expand All @@ -118,7 +118,7 @@ if(BUILD_TESTING)
mimick
rcl_action::rcl_action
rclcpp::rclcpp
${test_msgs_TARGETS}
test_msgs::test_msgs
)
endif()

Expand All @@ -127,26 +127,26 @@ if(BUILD_TESTING)
if(TARGET test_server_goal_handle)
target_link_libraries(test_server_goal_handle
${PROJECT_NAME}
${action_msgs_TARGETS}
action_msgs::action_msgs
mimick
rclcpp::rclcpp
${test_msgs_TARGETS}
test_msgs::test_msgs
)
endif()

ament_add_gtest(test_traits test/test_traits.cpp)
if(TARGET test_traits)
target_link_libraries(test_traits
${PROJECT_NAME}
${test_msgs_TARGETS}
test_msgs::test_msgs
)
endif()

ament_add_gtest(test_types test/test_types.cpp)
if(TARGET test_types)
target_link_libraries(test_types
${PROJECT_NAME}
${test_msgs_TARGETS}
test_msgs::test_msgs
)
endif()
endif()
Expand Down
4 changes: 2 additions & 2 deletions rclcpp_action/test/benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ add_performance_test(
benchmark_action_client.cpp
TIMEOUT 240)
if(TARGET benchmark_action_client)
target_link_libraries(benchmark_action_client ${PROJECT_NAME} rclcpp::rclcpp ${test_msgs_TARGETS})
target_link_libraries(benchmark_action_client ${PROJECT_NAME} rclcpp::rclcpp test_msgs::test_msgs)
endif()

add_performance_test(
benchmark_action_server
benchmark_action_server.cpp
TIMEOUT 120)
if(TARGET benchmark_action_server)
target_link_libraries(benchmark_action_server ${PROJECT_NAME} rclcpp::rclcpp ${test_msgs_TARGETS})
target_link_libraries(benchmark_action_server ${PROJECT_NAME} rclcpp::rclcpp test_msgs::test_msgs)
endif()
4 changes: 2 additions & 2 deletions rclcpp_components/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ target_include_directories(component_manager PUBLIC
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(component_manager PUBLIC
class_loader::class_loader
${composition_interfaces_TARGETS}
composition_interfaces::composition_interfaces
rclcpp::rclcpp
rmw::rmw
)
target_link_libraries(component_manager PRIVATE
ament_index_cpp::ament_index_cpp
rcpputils::rcpputils
${rcl_interfaces_TARGETS}
rcl_interfaces::rcl_interfaces
)
target_compile_definitions(component_manager
PRIVATE "RCLCPP_COMPONENTS_BUILDING_LIBRARY")
Expand Down
10 changes: 5 additions & 5 deletions rclcpp_lifecycle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ target_include_directories(${PROJECT_NAME}
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME}
${lifecycle_msgs_TARGETS}
lifecycle_msgs::lifecycle_msgs
rcl::rcl
rclcpp::rclcpp
${rcl_interfaces_TARGETS}
rcl_interfaces::rcl_interfaces
rcl_lifecycle::rcl_lifecycle
rcutils::rcutils
rosidl_typesupport_cpp::rosidl_typesupport_cpp
Expand Down Expand Up @@ -108,7 +108,7 @@ if(BUILD_TESTING)

ament_add_gtest(test_lifecycle_publisher test/test_lifecycle_publisher.cpp)
if(TARGET test_lifecycle_publisher)
target_link_libraries(test_lifecycle_publisher ${PROJECT_NAME} rcl_lifecycle::rcl_lifecycle rclcpp::rclcpp ${test_msgs_TARGETS})
target_link_libraries(test_lifecycle_publisher ${PROJECT_NAME} rcl_lifecycle::rcl_lifecycle rclcpp::rclcpp test_msgs::test_msgs)
endif()
ament_add_gtest(test_lifecycle_service_client test/test_lifecycle_service_client.cpp TIMEOUT 120)
ament_add_test_label(test_lifecycle_service_client mimick)
Expand All @@ -127,7 +127,7 @@ if(BUILD_TESTING)
target_link_libraries(test_client
${PROJECT_NAME}
mimick
${rcl_interfaces_TARGETS}
rcl_interfaces::rcl_interfaces
rclcpp::rclcpp)
endif()
ament_add_gtest(test_service test/test_service.cpp TIMEOUT 120)
Expand All @@ -136,7 +136,7 @@ if(BUILD_TESTING)
target_link_libraries(test_service
${PROJECT_NAME}
mimick
${test_msgs_TARGETS}
test_msgs::test_msgs
rclcpp::rclcpp)
endif()
ament_add_gtest(test_state_machine_info test/test_state_machine_info.cpp)
Expand Down