From af569fe6f44ab5c2f73aee57bb7f8abb2d2df36d Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Wed, 7 May 2025 17:09:11 -0400 Subject: [PATCH] [kilted] Update deprecated call to ament_target_dependencies --- smacc2/CMakeLists.txt | 2 +- smacc2_client_library/keyboard_client/CMakeLists.txt | 2 +- .../move_group_interface_client/CMakeLists.txt | 5 +++-- .../multirole_sensor_client/CMakeLists.txt | 2 +- .../backward_global_planner/CMakeLists.txt | 5 +++-- .../backward_local_planner/CMakeLists.txt | 5 +++-- .../forward_global_planner/CMakeLists.txt | 5 +++-- .../forward_local_planner/CMakeLists.txt | 5 +++-- .../nav2z_planners_common/CMakeLists.txt | 2 +- .../pure_spinning_local_planner/CMakeLists.txt | 2 +- .../undo_path_global_planner/CMakeLists.txt | 5 +++-- .../nav2z_client/nav2z_client/CMakeLists.txt | 5 +++-- .../ros_publisher_client/CMakeLists.txt | 2 +- smacc2_client_library/ros_timer_client/CMakeLists.txt | 2 +- .../eg_conditional_generator/CMakeLists.txt | 2 +- .../sm_atomic_performance_trace_1/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../sm_coretest_transition_speed_1/CMakeLists.txt | 2 +- .../sm_advanced_recovery_1/CMakeLists.txt | 2 +- smacc2_sm_reference_library/sm_atomic/CMakeLists.txt | 2 +- .../sm_atomic_24hr/CMakeLists.txt | 2 +- .../sm_atomic_hierarchy/CMakeLists.txt | 2 +- .../sm_atomic_services/CMakeLists.txt | 2 +- .../sm_autoware_avp/CMakeLists.txt | 2 +- .../sm_aws_warehouse_navigation/CMakeLists.txt | 2 +- .../sm_branching/CMakeLists.txt | 2 +- .../sm_dance_bot/CMakeLists.txt | 6 +++--- .../sm_dance_bot_strikes_back/CMakeLists.txt | 6 +++--- .../sm_dance_bot_warehouse/CMakeLists.txt | 6 +++--- .../sm_dance_bot_warehouse_2/CMakeLists.txt | 6 +++--- .../sm_dance_bot_warehouse_3/CMakeLists.txt | 6 +++--- .../sm_husky_barrel_search_1/CMakeLists.txt | 10 ++++++---- .../sm_multi_stage_1/CMakeLists.txt | 2 +- .../sm_multi_ur5_sim/CMakeLists.txt | 2 +- smacc2_sm_reference_library/sm_pack_ml/CMakeLists.txt | 2 +- smacc2_sm_reference_library/sm_pubsub_1/CMakeLists.txt | 4 ++-- .../sm_respira_1/CMakeLists.txt | 2 +- .../sm_test_moveit_ur5_sim/CMakeLists.txt | 2 +- .../sm_three_some/CMakeLists.txt | 2 +- .../sr_all_events_go/CMakeLists.txt | 2 +- .../sr_conditional/CMakeLists.txt | 2 +- .../sr_event_countdown/CMakeLists.txt | 2 +- 42 files changed, 72 insertions(+), 63 deletions(-) diff --git a/smacc2/CMakeLists.txt b/smacc2/CMakeLists.txt index 2c1784f2b..72d5dba3c 100644 --- a/smacc2/CMakeLists.txt +++ b/smacc2/CMakeLists.txt @@ -38,7 +38,7 @@ set_source_files_properties( COMPILE_FLAGS "-Wno-unused-parameter" ) -ament_target_dependencies(smacc2 ${dependencies}) +target_link_libraries(smacc2 PUBLIC ${dependencies}) target_link_libraries(smacc2 ${Boost_LIBRARIES} ${LTTNGUST_LIBRARIES} diff --git a/smacc2_client_library/keyboard_client/CMakeLists.txt b/smacc2_client_library/keyboard_client/CMakeLists.txt index 5676bf164..fc7b7310b 100644 --- a/smacc2_client_library/keyboard_client/CMakeLists.txt +++ b/smacc2_client_library/keyboard_client/CMakeLists.txt @@ -30,7 +30,7 @@ add_library(${PROJECT_NAME} ) target_link_libraries(${PROJECT_NAME} ${smacc2_LIBRARIES} ${std_msgs_LIBRARIES}) -ament_target_dependencies(${PROJECT_NAME} smacc2 std_msgs) +target_link_libraries(${PROJECT_NAME} PUBLIC smacc2 std_msgs) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/move_group_interface_client/CMakeLists.txt b/smacc2_client_library/move_group_interface_client/CMakeLists.txt index ccd24537a..8102ee10f 100644 --- a/smacc2_client_library/move_group_interface_client/CMakeLists.txt +++ b/smacc2_client_library/move_group_interface_client/CMakeLists.txt @@ -55,8 +55,9 @@ add_library(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} ${YAML_CPP_LIBRARIES}) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/multirole_sensor_client/CMakeLists.txt b/smacc2_client_library/multirole_sensor_client/CMakeLists.txt index 02c5b2d3a..9ef885015 100644 --- a/smacc2_client_library/multirole_sensor_client/CMakeLists.txt +++ b/smacc2_client_library/multirole_sensor_client/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories(include) add_library(${PROJECT_NAME} SHARED src/${PROJECT_NAME}/cl_multirole_sensor.cpp) -ament_target_dependencies(${PROJECT_NAME} ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies}) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/custom_planners/backward_global_planner/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/backward_global_planner/CMakeLists.txt index 3f54ee56f..9416ce277 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/backward_global_planner/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/backward_global_planner/CMakeLists.txt @@ -45,8 +45,9 @@ add_library(${PROJECT_NAME} SHARED target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(nav2_core bgp_plugin.xml) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/custom_planners/backward_local_planner/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/backward_local_planner/CMakeLists.txt index 85ae0fdf4..b3b6424cc 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/backward_local_planner/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/backward_local_planner/CMakeLists.txt @@ -43,8 +43,9 @@ add_library(${PROJECT_NAME} SHARED target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(nav2_core blp_plugin.xml) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/custom_planners/forward_global_planner/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/forward_global_planner/CMakeLists.txt index fe3397910..eaefc86c6 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/forward_global_planner/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/forward_global_planner/CMakeLists.txt @@ -42,8 +42,9 @@ add_library(${PROJECT_NAME} SHARED target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(nav2_core fgp_plugin.xml) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/custom_planners/forward_local_planner/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/forward_local_planner/CMakeLists.txt index e0cf05d50..064935391 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/forward_local_planner/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/forward_local_planner/CMakeLists.txt @@ -42,8 +42,9 @@ add_library(${PROJECT_NAME} SHARED target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(nav2_core flp_plugin.xml) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/custom_planners/nav2z_planners_common/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/nav2z_planners_common/CMakeLists.txt index 2e1b70d4e..05795082c 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/nav2z_planners_common/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/nav2z_planners_common/CMakeLists.txt @@ -36,7 +36,7 @@ include_directories(include) add_library(${PROJECT_NAME} SHARED src/${PROJECT_NAME}/common.cpp) -ament_target_dependencies(${PROJECT_NAME} ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies}) target_include_directories(${PROJECT_NAME} PRIVATE include) ament_export_include_directories(include) diff --git a/smacc2_client_library/nav2z_client/custom_planners/pure_spinning_local_planner/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/pure_spinning_local_planner/CMakeLists.txt index 5366e343f..7b3403d7b 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/pure_spinning_local_planner/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/pure_spinning_local_planner/CMakeLists.txt @@ -44,7 +44,7 @@ add_library(${PROJECT_NAME} SHARED # prevent pluginlib from using boost target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(nav2_core pslp_plugin.xml) -ament_target_dependencies(${PROJECT_NAME} ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies}) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/custom_planners/undo_path_global_planner/CMakeLists.txt b/smacc2_client_library/nav2z_client/custom_planners/undo_path_global_planner/CMakeLists.txt index 771161f11..8d3905e32 100644 --- a/smacc2_client_library/nav2z_client/custom_planners/undo_path_global_planner/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/custom_planners/undo_path_global_planner/CMakeLists.txt @@ -45,8 +45,9 @@ add_library(${PROJECT_NAME} SHARED target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(nav2_core upgp_plugin.xml) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/nav2z_client/nav2z_client/CMakeLists.txt b/smacc2_client_library/nav2z_client/nav2z_client/CMakeLists.txt index 74ead25a2..1be0df9a3 100644 --- a/smacc2_client_library/nav2z_client/nav2z_client/CMakeLists.txt +++ b/smacc2_client_library/nav2z_client/nav2z_client/CMakeLists.txt @@ -79,8 +79,9 @@ add_library(${PROJECT_NAME} SHARED src/${PROJECT_NAME}/components/slam_toolbox/cp_slam_toolbox.cpp ) -ament_target_dependencies(${PROJECT_NAME} - ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC + ${dependencies} +) target_link_libraries(${PROJECT_NAME}) diff --git a/smacc2_client_library/ros_publisher_client/CMakeLists.txt b/smacc2_client_library/ros_publisher_client/CMakeLists.txt index 926f56d04..9a28578d9 100644 --- a/smacc2_client_library/ros_publisher_client/CMakeLists.txt +++ b/smacc2_client_library/ros_publisher_client/CMakeLists.txt @@ -26,7 +26,7 @@ add_library(${PROJECT_NAME} SHARED ) target_link_libraries(${PROJECT_NAME} ${smacc2_LIBRARIES}) -ament_target_dependencies(${PROJECT_NAME} smacc2) +target_link_libraries(${PROJECT_NAME} PUBLIC smacc2) ament_export_dependencies(smacc2) ament_export_include_directories(include) diff --git a/smacc2_client_library/ros_timer_client/CMakeLists.txt b/smacc2_client_library/ros_timer_client/CMakeLists.txt index 5ea7b69dc..534d34bab 100644 --- a/smacc2_client_library/ros_timer_client/CMakeLists.txt +++ b/smacc2_client_library/ros_timer_client/CMakeLists.txt @@ -28,7 +28,7 @@ add_library(${PROJECT_NAME} src/${PROJECT_NAME}/cb_timer_countdown_once.cpp ) target_link_libraries(${PROJECT_NAME} SHARED ${Boost_LIBRARIES} smacc2) -ament_target_dependencies(${PROJECT_NAME} smacc2) +target_link_libraries(${PROJECT_NAME} PUBLIC smacc2) ament_export_include_directories(include) ament_export_dependencies(smacc2 Boost) diff --git a/smacc2_event_generator_library/eg_conditional_generator/CMakeLists.txt b/smacc2_event_generator_library/eg_conditional_generator/CMakeLists.txt index 2a1bcadc1..e917549d5 100644 --- a/smacc2_event_generator_library/eg_conditional_generator/CMakeLists.txt +++ b/smacc2_event_generator_library/eg_conditional_generator/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(include) add_library(${PROJECT_NAME} SHARED src/eg_conditional_generator/eg_conditional_generator.cpp) -ament_target_dependencies(${PROJECT_NAME} ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies}) ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) diff --git a/smacc2_performance_tools/performance_tests/sm_atomic_performance_trace_1/CMakeLists.txt b/smacc2_performance_tools/performance_tests/sm_atomic_performance_trace_1/CMakeLists.txt index 6afaec620..ec2468139 100644 --- a/smacc2_performance_tools/performance_tests/sm_atomic_performance_trace_1/CMakeLists.txt +++ b/smacc2_performance_tools/performance_tests/sm_atomic_performance_trace_1/CMakeLists.txt @@ -32,7 +32,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_performance_tools/performance_tests/sm_atomic_subscribers_performance_test/CMakeLists.txt b/smacc2_performance_tools/performance_tests/sm_atomic_subscribers_performance_test/CMakeLists.txt index 4ede518e8..0cd7eba58 100644 --- a/smacc2_performance_tools/performance_tests/sm_atomic_subscribers_performance_test/CMakeLists.txt +++ b/smacc2_performance_tools/performance_tests/sm_atomic_subscribers_performance_test/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_performance_tools/performance_tests/sm_coretest_transition_speed_1/CMakeLists.txt b/smacc2_performance_tools/performance_tests/sm_coretest_transition_speed_1/CMakeLists.txt index e83bd94f0..c57b297c5 100644 --- a/smacc2_performance_tools/performance_tests/sm_coretest_transition_speed_1/CMakeLists.txt +++ b/smacc2_performance_tools/performance_tests/sm_coretest_transition_speed_1/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_advanced_recovery_1/CMakeLists.txt b/smacc2_sm_reference_library/sm_advanced_recovery_1/CMakeLists.txt index a7140115d..deb154900 100644 --- a/smacc2_sm_reference_library/sm_advanced_recovery_1/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_advanced_recovery_1/CMakeLists.txt @@ -45,7 +45,7 @@ include_directories(include add_executable(${PROJECT_NAME}_node src/sm_advanced_recovery_1_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) ament_export_include_directories(include) target_link_libraries(${PROJECT_NAME}_node diff --git a/smacc2_sm_reference_library/sm_atomic/CMakeLists.txt b/smacc2_sm_reference_library/sm_atomic/CMakeLists.txt index 26d0bb8af..83cb7c2e0 100644 --- a/smacc2_sm_reference_library/sm_atomic/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_atomic/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_atomic_24hr/CMakeLists.txt b/smacc2_sm_reference_library/sm_atomic_24hr/CMakeLists.txt index ce19c9943..aa4c6bb48 100644 --- a/smacc2_sm_reference_library/sm_atomic_24hr/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_atomic_24hr/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_atomic_hierarchy/CMakeLists.txt b/smacc2_sm_reference_library/sm_atomic_hierarchy/CMakeLists.txt index fc90c952d..79e8c16a2 100644 --- a/smacc2_sm_reference_library/sm_atomic_hierarchy/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_atomic_hierarchy/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_atomic_services/CMakeLists.txt b/smacc2_sm_reference_library/sm_atomic_services/CMakeLists.txt index a787ecfff..f66d59e1c 100644 --- a/smacc2_sm_reference_library/sm_atomic_services/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_atomic_services/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(${PROJECT_NAME}_node ${std_srvs_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_autoware_avp/CMakeLists.txt b/smacc2_sm_reference_library/sm_autoware_avp/CMakeLists.txt index 75cd0c2b8..be053b19e 100644 --- a/smacc2_sm_reference_library/sm_autoware_avp/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_autoware_avp/CMakeLists.txt @@ -42,7 +42,7 @@ target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node ${THIS_PACKAGE_INCLUDE_DEPENDS}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_aws_warehouse_navigation/CMakeLists.txt b/smacc2_sm_reference_library/sm_aws_warehouse_navigation/CMakeLists.txt index 55070d7f1..639d18ec8 100644 --- a/smacc2_sm_reference_library/sm_aws_warehouse_navigation/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_aws_warehouse_navigation/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(${PROJECT_NAME}_node ) ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/env-hooks/sm_aws_warehouse_navigation.dsv.in") -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install(DIRECTORY launch DESTINATION share/${PROJECT_NAME}) install(DIRECTORY models DESTINATION share/${PROJECT_NAME}) diff --git a/smacc2_sm_reference_library/sm_branching/CMakeLists.txt b/smacc2_sm_reference_library/sm_branching/CMakeLists.txt index 21e772f5b..07ef06303 100644 --- a/smacc2_sm_reference_library/sm_branching/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_branching/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries( ${Boost_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) install(DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_dance_bot/CMakeLists.txt b/smacc2_sm_reference_library/sm_dance_bot/CMakeLists.txt index 6e89da645..b36f0de9d 100644 --- a/smacc2_sm_reference_library/sm_dance_bot/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_dance_bot/CMakeLists.txt @@ -60,14 +60,14 @@ add_executable(${PROJECT_NAME}_node add_executable(temperature_sensor_node_${PROJECT_NAME} servers/temperature_sensor_node/src/temperature_sensor_node.cpp) add_executable(led_action_server_node_${PROJECT_NAME} servers/led_action_server/src/led_action_server_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(led_action_server_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(led_action_server_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(led_action_server_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "led_action_server_node") target_link_libraries(led_action_server_node_${PROJECT_NAME} ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(temperature_sensor_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(temperature_sensor_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(temperature_sensor_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "temperature_sensor_node") ament_export_include_directories(include) diff --git a/smacc2_sm_reference_library/sm_dance_bot_strikes_back/CMakeLists.txt b/smacc2_sm_reference_library/sm_dance_bot_strikes_back/CMakeLists.txt index 8404ff163..bec62f187 100644 --- a/smacc2_sm_reference_library/sm_dance_bot_strikes_back/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_dance_bot_strikes_back/CMakeLists.txt @@ -63,14 +63,14 @@ add_executable( add_executable(temperature_sensor_node_${PROJECT_NAME} servers/temperature_sensor_node/src/temperature_sensor_node.cpp) add_executable(led_action_server_node_${PROJECT_NAME} servers/led_action_server/src/led_action_server_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies} rosidl_generator_cpp) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies} rosidl_generator_cpp) target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(led_action_server_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(led_action_server_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(led_action_server_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "led_action_server_node") target_link_libraries(led_action_server_node_${PROJECT_NAME} ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(temperature_sensor_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(temperature_sensor_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(temperature_sensor_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "temperature_sensor_node") ament_export_include_directories(include) diff --git a/smacc2_sm_reference_library/sm_dance_bot_warehouse/CMakeLists.txt b/smacc2_sm_reference_library/sm_dance_bot_warehouse/CMakeLists.txt index 629a23bdb..b3fa0d98d 100644 --- a/smacc2_sm_reference_library/sm_dance_bot_warehouse/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_dance_bot_warehouse/CMakeLists.txt @@ -60,14 +60,14 @@ add_executable(${PROJECT_NAME}_node add_executable(temperature_sensor_node_${PROJECT_NAME} servers/temperature_sensor_node/src/temperature_sensor_node.cpp) add_executable(led_action_server_node_${PROJECT_NAME} servers/led_action_server/src/led_action_server_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(led_action_server_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(led_action_server_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(led_action_server_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "led_action_server_node") target_link_libraries(led_action_server_node_${PROJECT_NAME} ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(temperature_sensor_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(temperature_sensor_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(temperature_sensor_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "temperature_sensor_node") ament_export_include_directories(include) diff --git a/smacc2_sm_reference_library/sm_dance_bot_warehouse_2/CMakeLists.txt b/smacc2_sm_reference_library/sm_dance_bot_warehouse_2/CMakeLists.txt index b90855320..71334cdf5 100644 --- a/smacc2_sm_reference_library/sm_dance_bot_warehouse_2/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_dance_bot_warehouse_2/CMakeLists.txt @@ -60,14 +60,14 @@ add_executable(${PROJECT_NAME}_node add_executable(temperature_sensor_node_${PROJECT_NAME} servers/temperature_sensor_node/src/temperature_sensor_node.cpp) add_executable(led_action_server_node_${PROJECT_NAME} servers/led_action_server/src/led_action_server_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(led_action_server_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(led_action_server_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(led_action_server_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "led_action_server_node") target_link_libraries(led_action_server_node_${PROJECT_NAME} ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(temperature_sensor_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(temperature_sensor_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(temperature_sensor_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "temperature_sensor_node") ament_export_include_directories(include) diff --git a/smacc2_sm_reference_library/sm_dance_bot_warehouse_3/CMakeLists.txt b/smacc2_sm_reference_library/sm_dance_bot_warehouse_3/CMakeLists.txt index c7aabf855..577bd3d54 100644 --- a/smacc2_sm_reference_library/sm_dance_bot_warehouse_3/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_dance_bot_warehouse_3/CMakeLists.txt @@ -60,14 +60,14 @@ add_executable(${PROJECT_NAME}_node add_executable(temperature_sensor_node_${PROJECT_NAME} servers/temperature_sensor_node/src/temperature_sensor_node.cpp) add_executable(led_action_server_node_${PROJECT_NAME} servers/led_action_server/src/led_action_server_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) target_link_libraries(${PROJECT_NAME}_node ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(led_action_server_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(led_action_server_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(led_action_server_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "led_action_server_node") target_link_libraries(led_action_server_node_${PROJECT_NAME} ${Boost_LIBS} ${PROJECT_NAME}__rosidl_typesupport_cpp) -ament_target_dependencies(temperature_sensor_node_${PROJECT_NAME} ${dependencies}) +target_link_libraries(temperature_sensor_node_${PROJECT_NAME} PUBLIC ${dependencies}) set_target_properties(temperature_sensor_node_${PROJECT_NAME} PROPERTIES OUTPUT_NAME "temperature_sensor_node") ament_export_include_directories(include) diff --git a/smacc2_sm_reference_library/sm_husky_barrel_search_1/CMakeLists.txt b/smacc2_sm_reference_library/sm_husky_barrel_search_1/CMakeLists.txt index c72aa4d4b..0cfbe6e20 100644 --- a/smacc2_sm_reference_library/sm_husky_barrel_search_1/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_husky_barrel_search_1/CMakeLists.txt @@ -62,7 +62,7 @@ add_executable(${PROJECT_NAME}_node src/${PROJECT_NAME}/sm_husky_barrel_search_1_node.cpp ) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) target_link_libraries(${PROJECT_NAME}_node boost_thread boost_system @@ -88,8 +88,10 @@ add_library(controllable_led_plugin SHARED target_include_directories(controllable_led_plugin PUBLIC include ${gazebo_ros_INCLUDE_DIRS}) - ament_target_dependencies(controllable_led_plugin - "std_msgs" ${dependencies}) + target_link_libraries(controllable_led_plugin PUBLIC + "std_msgs" + ${dependencies} +) target_link_libraries(controllable_led_plugin #/usr/lib/x86_64-linux-gnu/gazebo-11/plugins/libFlashLightPlugin.so @@ -108,7 +110,7 @@ add_library(controllable_led_plugin SHARED add_executable(opencv_perception_node servers/opencv_perception_node/opencv_perception_node.cpp ) -ament_target_dependencies(opencv_perception_node ${dependencies}) +target_link_libraries(opencv_perception_node PUBLIC ${dependencies}) target_link_libraries(opencv_perception_node boost_thread diff --git a/smacc2_sm_reference_library/sm_multi_stage_1/CMakeLists.txt b/smacc2_sm_reference_library/sm_multi_stage_1/CMakeLists.txt index ecbe19533..30e7fe18c 100644 --- a/smacc2_sm_reference_library/sm_multi_stage_1/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_multi_stage_1/CMakeLists.txt @@ -45,7 +45,7 @@ include_directories(include add_executable(${PROJECT_NAME}_node src/sm_multi_stage_1_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) ament_export_include_directories(include) target_link_libraries(${PROJECT_NAME}_node diff --git a/smacc2_sm_reference_library/sm_multi_ur5_sim/CMakeLists.txt b/smacc2_sm_reference_library/sm_multi_ur5_sim/CMakeLists.txt index 1cef7657d..03e74c4d2 100644 --- a/smacc2_sm_reference_library/sm_multi_ur5_sim/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_multi_ur5_sim/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(${PROJECT_NAME}_node ${move_group_interface_client_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node ${THIS_PACKAGE_INCLUDE_DEPENDS}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_pack_ml/CMakeLists.txt b/smacc2_sm_reference_library/sm_pack_ml/CMakeLists.txt index 668600dc3..40b86edd9 100644 --- a/smacc2_sm_reference_library/sm_pack_ml/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_pack_ml/CMakeLists.txt @@ -45,7 +45,7 @@ include_directories(include add_executable(${PROJECT_NAME}_node src/sm_pack_ml_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) ament_export_include_directories(include) target_link_libraries(${PROJECT_NAME}_node diff --git a/smacc2_sm_reference_library/sm_pubsub_1/CMakeLists.txt b/smacc2_sm_reference_library/sm_pubsub_1/CMakeLists.txt index 4d10c47e8..466f39e6d 100644 --- a/smacc2_sm_reference_library/sm_pubsub_1/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_pubsub_1/CMakeLists.txt @@ -50,9 +50,9 @@ target_link_libraries( ${keyboard_client_LIBRARIES} ${eg_conditional_generator_LIBRARIES}) -ament_target_dependencies(temperature_sensor_node smacc2) +target_link_libraries(temperature_sensor_node PUBLIC smacc2) -ament_target_dependencies(${PROJECT_NAME}_node smacc2) +target_link_libraries(${PROJECT_NAME}_node PUBLIC smacc2) ament_package() diff --git a/smacc2_sm_reference_library/sm_respira_1/CMakeLists.txt b/smacc2_sm_reference_library/sm_respira_1/CMakeLists.txt index 12bc0bb1c..96f65bf37 100644 --- a/smacc2_sm_reference_library/sm_respira_1/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_respira_1/CMakeLists.txt @@ -45,7 +45,7 @@ include_directories(include add_executable(${PROJECT_NAME}_node src/sm_respira_1_node.cpp) -ament_target_dependencies(${PROJECT_NAME}_node ${dependencies}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies}) ament_export_include_directories(include) target_link_libraries(${PROJECT_NAME}_node diff --git a/smacc2_sm_reference_library/sm_test_moveit_ur5_sim/CMakeLists.txt b/smacc2_sm_reference_library/sm_test_moveit_ur5_sim/CMakeLists.txt index c634bbdeb..981f79578 100644 --- a/smacc2_sm_reference_library/sm_test_moveit_ur5_sim/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_test_moveit_ur5_sim/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(${PROJECT_NAME}_node ${move_group_interface_client_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME}_node ${THIS_PACKAGE_INCLUDE_DEPENDS}) +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) install( DIRECTORY include/ diff --git a/smacc2_sm_reference_library/sm_three_some/CMakeLists.txt b/smacc2_sm_reference_library/sm_three_some/CMakeLists.txt index 81ee138b6..22d1e4e13 100644 --- a/smacc2_sm_reference_library/sm_three_some/CMakeLists.txt +++ b/smacc2_sm_reference_library/sm_three_some/CMakeLists.txt @@ -37,7 +37,7 @@ set(dependencies add_executable(${PROJECT_NAME}_node src/sm_three_some_node.cpp) target_include_directories(${PROJECT_NAME}_node PUBLIC include) -ament_target_dependencies(${PROJECT_NAME}_node +target_link_libraries(${PROJECT_NAME}_node PUBLIC ${dependencies} ) target_link_libraries(${PROJECT_NAME}_node diff --git a/smacc2_state_reactor_library/sr_all_events_go/CMakeLists.txt b/smacc2_state_reactor_library/sr_all_events_go/CMakeLists.txt index f58dbfa3c..5f52e3e49 100644 --- a/smacc2_state_reactor_library/sr_all_events_go/CMakeLists.txt +++ b/smacc2_state_reactor_library/sr_all_events_go/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(${PROJECT_NAME} SHARED ${smacc2_LIBRARIES} ${smacc2_msgs_LIBRARIES} ) -ament_target_dependencies(${PROJECT_NAME} smacc2 smacc2_msgs) +target_link_libraries(${PROJECT_NAME} PUBLIC smacc2 smacc2_msgs) ament_export_dependencies(smacc2) ament_export_include_directories(include) diff --git a/smacc2_state_reactor_library/sr_conditional/CMakeLists.txt b/smacc2_state_reactor_library/sr_conditional/CMakeLists.txt index 1aa37be11..d45067f79 100644 --- a/smacc2_state_reactor_library/sr_conditional/CMakeLists.txt +++ b/smacc2_state_reactor_library/sr_conditional/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(include) add_library(${PROJECT_NAME} SHARED src/${PROJECT_NAME}/sr_conditional.cpp) -ament_target_dependencies(${PROJECT_NAME} ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies}) ament_export_dependencies(${dependencies}) ament_export_include_directories(include) diff --git a/smacc2_state_reactor_library/sr_event_countdown/CMakeLists.txt b/smacc2_state_reactor_library/sr_event_countdown/CMakeLists.txt index 6098364f3..779eea516 100644 --- a/smacc2_state_reactor_library/sr_event_countdown/CMakeLists.txt +++ b/smacc2_state_reactor_library/sr_event_countdown/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(include) add_library(${PROJECT_NAME} src/${PROJECT_NAME}/sr_event_countdown.cpp) -ament_target_dependencies(${PROJECT_NAME} ${dependencies}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies}) ament_export_dependencies(${dependencies}) ament_export_include_directories(include)