From ad8c689b4ab66bed34d6e7ab7ac8eb93b6ddf7e5 Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Sat, 8 Feb 2025 00:51:44 +0000 Subject: [PATCH 1/3] Use target_link_libraries instead of ament_target_dependencies Signed-off-by: Shane Loretz --- rmw_connextdds_common/CMakeLists.txt | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/rmw_connextdds_common/CMakeLists.txt b/rmw_connextdds_common/CMakeLists.txt index c8d39703..3e6269de 100644 --- a/rmw_connextdds_common/CMakeLists.txt +++ b/rmw_connextdds_common/CMakeLists.txt @@ -58,10 +58,8 @@ function(rtirmw_add_library) target_link_libraries(${_rti_build_NAME} ${_rti_build_LIBRARIES} - fastcdr) - - ament_target_dependencies(${_rti_build_NAME} - ${_rti_build_DEPS}) + fastcdr + ${_rti_build_DEPS}) set(_extra_defines) if("${CMAKE_BUILD_TYPE}" MATCHES "[dD]ebug") @@ -107,6 +105,19 @@ endfunction() ################################################################################ # Load external dependencies ################################################################################ +set(RMW_CONNEXT_TARGET_DEPS + rcutils::rclutils + rcpputils::rcpputils + rmw::rmw + rmw_dds_common::rmw_dds_common_library + tracetools::tracetools + fastcdr::fastcdr + rosidl_runtime_c::rosidl_runtime_c + rosidl_runtime_cpp::rosidl_runtime_cpp + rosidl_typesupport_fastrtps_c::rosidl_typesupport_fastrtps_c + rosidl_typesupport_fastrtps_cpp::rosidl_typesupport_fastrtps_cpp + rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c + rosidl_typesupport_introspection_cpp::rosidl_typesupport_introspection_cpp) set(RMW_CONNEXT_DEPS rcutils rcpputils @@ -213,7 +224,7 @@ else() include/rmw_connextdds/typecode.hpp include/rmw_connextdds/dds_api_ndds.hpp include/rmw_connextdds/custom_sql_filter.hpp - DEPS ${RMW_CONNEXT_DEPS} + DEPS ${RMW_CONNEXT_TARGET_DEPS} LIBRARIES RTIConnextDDS::c_api DEFINES ${extra_defines}) endif() @@ -278,7 +289,7 @@ else() src/rtime/rmw_type_support_rtime.cpp src/rtime/dds_api_rtime.cpp include/rmw_connextdds/dds_api_rtime.hpp - DEPS ${RMW_CONNEXT_DEPS} + DEPS ${RMW_CONNEXT_TARGET_DEPS} LIBRARIES RTIConnextDDSMicro::c_api RTIConnextDDSMicro::netiosdm RTIConnextDDSMicro::netioshmem From 3e4a6f4aa6c57f21b01e3a5f97c6cd019ac08be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 10 Feb 2025 14:19:05 +0100 Subject: [PATCH 2/3] Update rmw_connextdds_common/CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- rmw_connextdds_common/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmw_connextdds_common/CMakeLists.txt b/rmw_connextdds_common/CMakeLists.txt index 3e6269de..691f8c1e 100644 --- a/rmw_connextdds_common/CMakeLists.txt +++ b/rmw_connextdds_common/CMakeLists.txt @@ -106,7 +106,7 @@ endfunction() # Load external dependencies ################################################################################ set(RMW_CONNEXT_TARGET_DEPS - rcutils::rclutils + rcutils::rcutils rcpputils::rcpputils rmw::rmw rmw_dds_common::rmw_dds_common_library From d8a376d3a140381eb0bc48ec881587066ffaba5e Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Mon, 10 Feb 2025 17:25:38 +0000 Subject: [PATCH 3/3] Fix fastcdr linking Signed-off-by: Shane Loretz --- rmw_connextdds_common/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rmw_connextdds_common/CMakeLists.txt b/rmw_connextdds_common/CMakeLists.txt index 691f8c1e..80062a93 100644 --- a/rmw_connextdds_common/CMakeLists.txt +++ b/rmw_connextdds_common/CMakeLists.txt @@ -58,8 +58,7 @@ function(rtirmw_add_library) target_link_libraries(${_rti_build_NAME} ${_rti_build_LIBRARIES} - fastcdr - ${_rti_build_DEPS}) + ${_rti_build_DEPS}) set(_extra_defines) if("${CMAKE_BUILD_TYPE}" MATCHES "[dD]ebug") @@ -111,7 +110,7 @@ set(RMW_CONNEXT_TARGET_DEPS rmw::rmw rmw_dds_common::rmw_dds_common_library tracetools::tracetools - fastcdr::fastcdr + fastcdr rosidl_runtime_c::rosidl_runtime_c rosidl_runtime_cpp::rosidl_runtime_cpp rosidl_typesupport_fastrtps_c::rosidl_typesupport_fastrtps_c