Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 10 additions & 10 deletions rmw_microxrcedds_c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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
Expand All @@ -271,19 +271,19 @@ 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
HAVE_CPP_TYPESUPPORT
)
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})
Expand Down
2 changes: 1 addition & 1 deletion rmw_microxrcedds_c/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down