From 73eca6a497d8bc8a912dd7ece646bf0029a9b50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Wed, 21 May 2025 12:36:12 +0200 Subject: [PATCH 1/2] Use target_link_libraries instead of ament_target_dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- rmw_microxrcedds_c/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rmw_microxrcedds_c/CMakeLists.txt b/rmw_microxrcedds_c/CMakeLists.txt index 451719bc..e5eff9b5 100644 --- a/rmw_microxrcedds_c/CMakeLists.txt +++ b/rmw_microxrcedds_c/CMakeLists.txt @@ -246,8 +246,8 @@ if(RMW_UXRCE_GRAPH) PROPERTY IMPORTED_LOCATION ${micro_ros_msgs_LIBRARIES__rosidl_typesupport_microxrcedds_c}) - ament_target_dependencies(${PROJECT_NAME} - "micro_ros_msgs" + target_link_libraries(${PROJECT_NAME} + ${micro_ros_msgs_TARGETS} ) endif() @@ -260,8 +260,8 @@ target_link_libraries(${PROJECT_NAME} # Type support lock-up mechanism find_package(rosidl_typesupport_microxrcedds_c) if(rosidl_typesupport_microxrcedds_c_FOUND) - ament_target_dependencies(${PROJECT_NAME} - "rosidl_typesupport_microxrcedds_c" + target_link_libraries(${PROJECT_NAME} + rosidl_typesupport_microxrcedds_c::rosidl_typesupport_microxrcedds_c ) target_compile_definitions(${PROJECT_NAME} PUBLIC @@ -271,8 +271,8 @@ else() find_package(rosidl_typesupport_microxrcedds_cpp REQUIRED) endif() if(rosidl_typesupport_microxrcedds_cpp_FOUND) - ament_target_dependencies(${PROJECT_NAME} - "rosidl_typesupport_microxrcedds_cpp" + target_link_libraries(${PROJECT_NAME} + rosidl_typesupport_microxrcedds_cpp::rosidl_typesupport_microxrcedds_cpp ) target_compile_definitions(${PROJECT_NAME} PUBLIC @@ -280,10 +280,10 @@ if(rosidl_typesupport_microxrcedds_cpp_FOUND) ) endif() -ament_target_dependencies(${PROJECT_NAME} - "rcutils" - "rmw" - "microxrcedds_client" +target_link_libraries(${PROJECT_NAME} + rcutils::rcutils + rmw::rmw + microxrcedds_client ) configure_rmw_library(${PROJECT_NAME}) From 9097b6830b2a5b6578691be043c26fe1385e1ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Thu, 22 May 2025 08:23:27 +0200 Subject: [PATCH 2/2] Remove ament_target_dependencies from test/CmakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- rmw_microxrcedds_c/test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmw_microxrcedds_c/test/CMakeLists.txt b/rmw_microxrcedds_c/test/CMakeLists.txt index 32198dee..4e3a3eca 100644 --- a/rmw_microxrcedds_c/test/CMakeLists.txt +++ b/rmw_microxrcedds_c/test/CMakeLists.txt @@ -44,7 +44,7 @@ macro(rmw_test TEST_NAME TEST_SOURCE) CXX_STANDARD_REQUIRED YES) - ament_target_dependencies(${TEST_NAME} rmw) + target_link_libraries(${TEST_NAME} rmw::rmw) endmacro() rmw_test(test-node test_node.cpp)