From 0c102996d727ae99e04e16004add4015a6c84753 Mon Sep 17 00:00:00 2001 From: Blake McHale Date: Wed, 28 Jan 2026 11:33:53 -0800 Subject: [PATCH 1/3] Add ament_cmake as package in CMakelist Signed-off-by: Blake McHale --- greenwave_monitor/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/greenwave_monitor/CMakeLists.txt b/greenwave_monitor/CMakeLists.txt index be5e422..87182ef 100644 --- a/greenwave_monitor/CMakeLists.txt +++ b/greenwave_monitor/CMakeLists.txt @@ -20,6 +20,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif() # find dependencies +find_package(ament_cmake REQUIRED) find_package(ament_cmake_auto REQUIRED) ament_auto_find_build_dependencies() From f9046aead9efbb6ee76a22b71edf167d6c91d4cf Mon Sep 17 00:00:00 2001 From: Blake McHale Date: Thu, 26 Feb 2026 10:54:59 -0800 Subject: [PATCH 2/3] Add more depends Signed-off-by: Blake McHale --- greenwave_monitor/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/greenwave_monitor/CMakeLists.txt b/greenwave_monitor/CMakeLists.txt index 87182ef..9373ad2 100644 --- a/greenwave_monitor/CMakeLists.txt +++ b/greenwave_monitor/CMakeLists.txt @@ -20,8 +20,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif() # find dependencies -find_package(ament_cmake REQUIRED) find_package(ament_cmake_auto REQUIRED) +find_package(ament_cmake_target_dependencies REQUIRED) ament_auto_find_build_dependencies() # Add greenwave_diagnostics.hpp as a header-only library From 834eb646df0ef55c84fdd8952f57e7247d8bf37a Mon Sep 17 00:00:00 2001 From: Blake McHale Date: Thu, 26 Feb 2026 11:10:50 -0800 Subject: [PATCH 3/3] Test new target link libraries Signed-off-by: Blake McHale --- greenwave_monitor/CMakeLists.txt | 60 ++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/greenwave_monitor/CMakeLists.txt b/greenwave_monitor/CMakeLists.txt index 9373ad2..933b8fc 100644 --- a/greenwave_monitor/CMakeLists.txt +++ b/greenwave_monitor/CMakeLists.txt @@ -21,7 +21,6 @@ endif() # find dependencies find_package(ament_cmake_auto REQUIRED) -find_package(ament_cmake_target_dependencies REQUIRED) ament_auto_find_build_dependencies() # Add greenwave_diagnostics.hpp as a header-only library @@ -31,13 +30,13 @@ target_include_directories(greenwave_diagnostics INTERFACE $) add_executable(greenwave_monitor src/greenwave_monitor.cpp src/greenwave_monitor_main.cpp) -ament_target_dependencies(greenwave_monitor - rclcpp - std_msgs - diagnostic_msgs - greenwave_monitor_interfaces +target_link_libraries(greenwave_monitor + greenwave_diagnostics + ${rclcpp_TARGETS} + ${std_msgs_TARGETS} + ${diagnostic_msgs_TARGETS} + ${greenwave_monitor_interfaces_TARGETS} ) -target_link_libraries(greenwave_monitor greenwave_diagnostics) target_include_directories(greenwave_monitor PUBLIC $ @@ -51,8 +50,13 @@ install(TARGETS greenwave_monitor add_executable(minimal_publisher_node src/minimal_publisher_node.cpp src/minimal_publisher_main.cpp) -ament_target_dependencies(minimal_publisher_node rclcpp std_msgs sensor_msgs diagnostic_msgs) -target_link_libraries(minimal_publisher_node greenwave_diagnostics) +target_link_libraries(minimal_publisher_node + greenwave_diagnostics + ${rclcpp_TARGETS} + ${std_msgs_TARGETS} + ${sensor_msgs_TARGETS} + ${diagnostic_msgs_TARGETS} +) target_include_directories(minimal_publisher_node PUBLIC $ $) @@ -63,8 +67,12 @@ install(TARGETS minimal_publisher_node add_executable(example_greenwave_publisher_node src/example_greenwave_publisher_node.cpp src/example_greenwave_publisher_main.cpp) -ament_target_dependencies(example_greenwave_publisher_node rclcpp sensor_msgs diagnostic_msgs) -target_link_libraries(example_greenwave_publisher_node greenwave_diagnostics) +target_link_libraries(example_greenwave_publisher_node + greenwave_diagnostics + ${rclcpp_TARGETS} + ${sensor_msgs_TARGETS} + ${diagnostic_msgs_TARGETS} +) target_include_directories(example_greenwave_publisher_node PUBLIC $ $) @@ -134,12 +142,12 @@ if(BUILD_TESTING) TIMEOUT 60 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) - ament_target_dependencies(test_greenwave_diagnostics - rclcpp - std_msgs - diagnostic_msgs + target_link_libraries(test_greenwave_diagnostics + greenwave_diagnostics + ${rclcpp_TARGETS} + ${std_msgs_TARGETS} + ${diagnostic_msgs_TARGETS} ) - target_link_libraries(test_greenwave_diagnostics greenwave_diagnostics) target_include_directories(test_greenwave_diagnostics PUBLIC $ $ @@ -152,12 +160,12 @@ if(BUILD_TESTING) TIMEOUT 60 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) - ament_target_dependencies(test_minimal_publisher - rclcpp - sensor_msgs - diagnostic_msgs + target_link_libraries(test_minimal_publisher + greenwave_diagnostics + ${rclcpp_TARGETS} + ${sensor_msgs_TARGETS} + ${diagnostic_msgs_TARGETS} ) - target_link_libraries(test_minimal_publisher greenwave_diagnostics) target_include_directories(test_minimal_publisher PUBLIC $ $ @@ -170,12 +178,12 @@ if(BUILD_TESTING) TIMEOUT 60 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) - ament_target_dependencies(test_example_greenwave_publisher - rclcpp - sensor_msgs - diagnostic_msgs + target_link_libraries(test_example_greenwave_publisher + greenwave_diagnostics + ${rclcpp_TARGETS} + ${sensor_msgs_TARGETS} + ${diagnostic_msgs_TARGETS} ) - target_link_libraries(test_example_greenwave_publisher greenwave_diagnostics) target_include_directories(test_example_greenwave_publisher PUBLIC $ $