From 3fef8c1e3d927ba34f7c9fde073a17ae83db22cc Mon Sep 17 00:00:00 2001 From: Sai Kishor Kothakota Date: Sat, 9 Nov 2024 09:00:03 +0000 Subject: [PATCH] Fix conflicts --- controller_manager/CMakeLists.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt index 574225ca4c..e97964a59f 100644 --- a/controller_manager/CMakeLists.txt +++ b/controller_manager/CMakeLists.txt @@ -171,19 +171,8 @@ if(BUILD_TESTING) test/test_spawner_unspawner.cpp TIMEOUT 120 ) -<<<<<<< HEAD - target_include_directories(test_spawner_unspawner PRIVATE include) - target_link_libraries(test_spawner_unspawner ${PROJECT_NAME} test_controller) - ament_target_dependencies(test_spawner_unspawner ros2_control_test_assets) -======= - target_link_libraries(test_spawner_unspawner - controller_manager - test_controller - ros2_control_test_assets::ros2_control_test_assets - ) - ament_add_gmock(test_hardware_spawner - test/test_hardware_spawner + test/test_hardware_spawner.cpp TIMEOUT 120 ) target_link_libraries(test_hardware_spawner @@ -191,10 +180,6 @@ if(BUILD_TESTING) ros2_control_test_assets::ros2_control_test_assets ) - install(FILES test/test_controller_spawner_with_fallback_controllers.yaml - DESTINATION test) ->>>>>>> 5dbd6d5 (Fix Hardware spawner and add tests for it (#1759)) - install(FILES test/test_controller_spawner_with_type.yaml DESTINATION test)