Skip to content

Commit dc7bfe5

Browse files
emersonknappemersonknapp
authored
Use new ROSIDL aggregate CMake target (#3105)
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
1 parent af78e01 commit dc7bfe5

File tree

7 files changed

+81
-81
lines changed

7 files changed

+81
-81
lines changed

‎rclcpp/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,20 +203,20 @@ target_include_directories(${PROJECT_NAME} PUBLIC
203203
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
204204
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
205205
target_link_libraries(${PROJECT_NAME} PUBLIC
206-
${builtin_interfaces_TARGETS}
206+
builtin_interfaces::builtin_interfaces
207207
libstatistics_collector::libstatistics_collector
208208
rcl::rcl
209-
${rcl_interfaces_TARGETS}
209+
rcl_interfaces::rcl_interfaces
210210
rcl_yaml_param_parser::rcl_yaml_param_parser
211211
rcpputils::rcpputils
212212
rcutils::rcutils
213213
rmw::rmw
214-
${rosgraph_msgs_TARGETS}
214+
rosgraph_msgs::rosgraph_msgs
215215
rosidl_dynamic_typesupport::rosidl_dynamic_typesupport
216216
rosidl_runtime_c::rosidl_runtime_c
217217
rosidl_runtime_cpp::rosidl_runtime_cpp
218218
rosidl_typesupport_cpp::rosidl_typesupport_cpp
219-
${statistics_msgs_TARGETS}
219+
statistics_msgs::statistics_msgs
220220
tracetools::tracetools
221221
${CMAKE_THREAD_LIBS_INIT}
222222
)

‎rclcpp/test/benchmark/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ find_package(performance_test_fixture REQUIRED)
77

88
add_performance_test(benchmark_client benchmark_client.cpp)
99
if(TARGET benchmark_client)
10-
target_link_libraries(benchmark_client ${PROJECT_NAME} ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS})
10+
target_link_libraries(benchmark_client ${PROJECT_NAME} rcl_interfaces::rcl_interfaces test_msgs::test_msgs)
1111
endif()
1212

1313
add_performance_test(benchmark_executor benchmark_executor.cpp)
1414
if(TARGET benchmark_executor)
15-
target_link_libraries(benchmark_executor ${PROJECT_NAME} ${test_msgs_TARGETS})
15+
target_link_libraries(benchmark_executor ${PROJECT_NAME} test_msgs::test_msgs)
1616
endif()
1717

1818
add_performance_test(benchmark_init_shutdown benchmark_init_shutdown.cpp)
@@ -37,5 +37,5 @@ endif()
3737

3838
add_performance_test(benchmark_service benchmark_service.cpp)
3939
if(TARGET benchmark_service)
40-
target_link_libraries(benchmark_service ${PROJECT_NAME} ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS})
40+
target_link_libraries(benchmark_service ${PROJECT_NAME} rcl_interfaces::rcl_interfaces test_msgs::test_msgs)
4141
endif()

‎rclcpp/test/rclcpp/CMakeLists.txt‎

Lines changed: 57 additions & 57 deletions
Large diffs are not rendered by default.

‎rclcpp_action/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ target_include_directories(${PROJECT_NAME}
3737
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
3838
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
3939
target_link_libraries(${PROJECT_NAME} PUBLIC
40-
${action_msgs_TARGETS}
40+
action_msgs::action_msgs
4141
rcl::rcl
4242
rcl_action::rcl_action
4343
rclcpp::rclcpp
@@ -92,7 +92,7 @@ if(BUILD_TESTING)
9292
rcl_action::rcl_action
9393
rclcpp::rclcpp
9494
rcutils::rcutils
95-
${test_msgs_TARGETS}
95+
test_msgs::test_msgs
9696
)
9797
endif()
9898

@@ -106,7 +106,7 @@ if(BUILD_TESTING)
106106
rcl_action::rcl_action
107107
rclcpp::rclcpp
108108
rcutils::rcutils
109-
${test_msgs_TARGETS}
109+
test_msgs::test_msgs
110110
)
111111
endif()
112112

@@ -118,7 +118,7 @@ if(BUILD_TESTING)
118118
mimick
119119
rcl_action::rcl_action
120120
rclcpp::rclcpp
121-
${test_msgs_TARGETS}
121+
test_msgs::test_msgs
122122
)
123123
endif()
124124

@@ -127,26 +127,26 @@ if(BUILD_TESTING)
127127
if(TARGET test_server_goal_handle)
128128
target_link_libraries(test_server_goal_handle
129129
${PROJECT_NAME}
130-
${action_msgs_TARGETS}
130+
action_msgs::action_msgs
131131
mimick
132132
rclcpp::rclcpp
133-
${test_msgs_TARGETS}
133+
test_msgs::test_msgs
134134
)
135135
endif()
136136

137137
ament_add_gtest(test_traits test/test_traits.cpp)
138138
if(TARGET test_traits)
139139
target_link_libraries(test_traits
140140
${PROJECT_NAME}
141-
${test_msgs_TARGETS}
141+
test_msgs::test_msgs
142142
)
143143
endif()
144144

145145
ament_add_gtest(test_types test/test_types.cpp)
146146
if(TARGET test_types)
147147
target_link_libraries(test_types
148148
${PROJECT_NAME}
149-
${test_msgs_TARGETS}
149+
test_msgs::test_msgs
150150
)
151151
endif()
152152
endif()

‎rclcpp_action/test/benchmark/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ add_performance_test(
99
benchmark_action_client.cpp
1010
TIMEOUT 240)
1111
if(TARGET benchmark_action_client)
12-
target_link_libraries(benchmark_action_client ${PROJECT_NAME} rclcpp::rclcpp ${test_msgs_TARGETS})
12+
target_link_libraries(benchmark_action_client ${PROJECT_NAME} rclcpp::rclcpp test_msgs::test_msgs)
1313
endif()
1414

1515
add_performance_test(
1616
benchmark_action_server
1717
benchmark_action_server.cpp
1818
TIMEOUT 120)
1919
if(TARGET benchmark_action_server)
20-
target_link_libraries(benchmark_action_server ${PROJECT_NAME} rclcpp::rclcpp ${test_msgs_TARGETS})
20+
target_link_libraries(benchmark_action_server ${PROJECT_NAME} rclcpp::rclcpp test_msgs::test_msgs)
2121
endif()

‎rclcpp_components/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ target_include_directories(component_manager PUBLIC
4242
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
4343
target_link_libraries(component_manager PUBLIC
4444
class_loader::class_loader
45-
${composition_interfaces_TARGETS}
45+
composition_interfaces::composition_interfaces
4646
rclcpp::rclcpp
4747
rmw::rmw
4848
)
4949
target_link_libraries(component_manager PRIVATE
5050
ament_index_cpp::ament_index_cpp
5151
rcpputils::rcpputils
52-
${rcl_interfaces_TARGETS}
52+
rcl_interfaces::rcl_interfaces
5353
)
5454
target_compile_definitions(component_manager
5555
PRIVATE "RCLCPP_COMPONENTS_BUILDING_LIBRARY")

‎rclcpp_lifecycle/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ target_include_directories(${PROJECT_NAME}
3434
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
3535
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
3636
target_link_libraries(${PROJECT_NAME}
37-
${lifecycle_msgs_TARGETS}
37+
lifecycle_msgs::lifecycle_msgs
3838
rcl::rcl
3939
rclcpp::rclcpp
40-
${rcl_interfaces_TARGETS}
40+
rcl_interfaces::rcl_interfaces
4141
rcl_lifecycle::rcl_lifecycle
4242
rcutils::rcutils
4343
rosidl_typesupport_cpp::rosidl_typesupport_cpp
@@ -108,7 +108,7 @@ if(BUILD_TESTING)
108108

109109
ament_add_gtest(test_lifecycle_publisher test/test_lifecycle_publisher.cpp)
110110
if(TARGET test_lifecycle_publisher)
111-
target_link_libraries(test_lifecycle_publisher ${PROJECT_NAME} rcl_lifecycle::rcl_lifecycle rclcpp::rclcpp ${test_msgs_TARGETS})
111+
target_link_libraries(test_lifecycle_publisher ${PROJECT_NAME} rcl_lifecycle::rcl_lifecycle rclcpp::rclcpp test_msgs::test_msgs)
112112
endif()
113113
ament_add_gtest(test_lifecycle_service_client test/test_lifecycle_service_client.cpp TIMEOUT 120)
114114
ament_add_test_label(test_lifecycle_service_client mimick)
@@ -127,7 +127,7 @@ if(BUILD_TESTING)
127127
target_link_libraries(test_client
128128
${PROJECT_NAME}
129129
mimick
130-
${rcl_interfaces_TARGETS}
130+
rcl_interfaces::rcl_interfaces
131131
rclcpp::rclcpp)
132132
endif()
133133
ament_add_gtest(test_service test/test_service.cpp TIMEOUT 120)
@@ -136,7 +136,7 @@ if(BUILD_TESTING)
136136
target_link_libraries(test_service
137137
${PROJECT_NAME}
138138
mimick
139-
${test_msgs_TARGETS}
139+
test_msgs::test_msgs
140140
rclcpp::rclcpp)
141141
endif()
142142
ament_add_gtest(test_state_machine_info test/test_state_machine_info.cpp)

0 commit comments

Comments
 (0)