Skip to content

Use target_link_libraries instead of ament_target_dependencies #507

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

Merged
merged 1 commit into from
May 26, 2025
+18 −16
Merged

Use target_link_libraries instead of ament_target_dependencies #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions diagnostic_remote_logging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
ament_add_gtest(unit_tests test/influx_line_protocol.cpp)
target_include_directories(unit_tests PRIVATE include)
target_link_libraries(unit_tests influx_component)
ament_target_dependencies(unit_tests ${dependencies} ament_cmake_gtest)
target_link_libraries(unit_tests
influx_component
${diagnostic_msgs_TARGETS}
rclcpp::rclcpp
rclcpp_components::component
rclcpp_components::component_manager
)
endif()
ament_package()
16 changes: 7 additions & 9 deletions diagnostic_updater/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ if(BUILD_TESTING)
$<INSTALL_INTERFACE:include>
)
target_link_libraries(diagnostic_updater_test ${PROJECT_NAME})
ament_target_dependencies(
diagnostic_updater_test
"rclcpp_lifecycle"
target_link_libraries(diagnostic_updater_test
rclcpp_lifecycle::rclcpp_lifecycle
)

ament_add_gtest(diagnostic_status_wrapper_test test/diagnostic_status_wrapper_test.cpp)
Expand All @@ -79,12 +78,11 @@ if(BUILD_TESTING)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
ament_target_dependencies(
diagnostic_status_wrapper_test
"diagnostic_msgs"
"rclcpp"
"rclcpp_lifecycle"
"std_msgs"
target_link_libraries(diagnostic_status_wrapper_test
${diagnostic_msgs_TARGETS}
${std_msgs_TARGETS}
rclcpp::rclcpp
rclcpp_lifecycle::rclcpp_lifecycle
)
# SKIPPING FLAKY TEST
# ament_add_gtest(status_msg_test test/status_msg_test.cpp)
Expand Down
9 changes: 4 additions & 5 deletions self_test/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ find_package(ament_cmake_gtest REQUIRED)
macro(add_self_test target_name file_path)
ament_add_gtest(${target_name} ${file_path})
if(TARGET ${target_name})
ament_target_dependencies(
${target_name}
"diagnostic_msgs"
"diagnostic_updater"
"rclcpp"
target_link_libraries(${target_name}
${diagnostic_msgs_TARGETS}
diagnostic_updater::diagnostic_updater
rclcpp::rclcpp
)
target_include_directories(${target_name}
PUBLIC
Expand Down
Loading