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.

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

Use target_link_libraries instead of ament_target_dependencies #169

Merged
merged 3 commits into from
Feb 10, 2025
Merged

Use target_link_libraries instead of ament_target_dependencies #169

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad8c689
Use target_link_libraries instead of ament_target_dependencies
sloretz Feb 8, 2025
3e4a6f4
Update rmw_connextdds_common/CMakeLists.txt
ahcorde Feb 10, 2025
d8a376d
Fix fastcdr linking
sloretz Feb 10, 2025
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
20 changes: 15 additions & 5 deletions rmw_connextdds_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ function(rtirmw_add_library)

target_link_libraries(${_rti_build_NAME}
${_rti_build_LIBRARIES}
fastcdr)

ament_target_dependencies(${_rti_build_NAME}
${_rti_build_DEPS})

set(_extra_defines)
Expand Down Expand Up @@ -107,6 +104,19 @@ endfunction()
################################################################################
# Load external dependencies
################################################################################
set(RMW_CONNEXT_TARGET_DEPS
rcutils::rcutils
rcpputils::rcpputils
rmw::rmw
rmw_dds_common::rmw_dds_common_library
tracetools::tracetools
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
Expand Down Expand Up @@ -213,7 +223,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()
Expand Down Expand Up @@ -278,7 +288,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
Expand Down