From ce8b3921b478afd7c48c3177f969f9301529caa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:44:34 +0100
Subject: [PATCH] Fix CMP0115 (#1830)

(cherry picked from commit 434f7f54c91114028b8f73c927ecee41588f2bce)

# Conflicts:
#	controller_manager/CMakeLists.txt
---
 controller_manager/CMakeLists.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt
index 312f5761a8..6d7dac5e94 100644
--- a/controller_manager/CMakeLists.txt
+++ b/controller_manager/CMakeLists.txt
@@ -190,6 +190,21 @@ if(BUILD_TESTING)
     ros2_control_test_assets::ros2_control_test_assets
   )
 
+<<<<<<< HEAD
+=======
+  ament_add_gmock(test_hardware_spawner
+    test/test_hardware_spawner.cpp
+    TIMEOUT 120
+  )
+  target_link_libraries(test_hardware_spawner
+    controller_manager
+    ros2_control_test_assets::ros2_control_test_assets
+  )
+
+  install(FILES test/test_controller_spawner_with_fallback_controllers.yaml
+    DESTINATION test)
+
+>>>>>>> 434f7f5 (Fix CMP0115 (#1830))
   install(FILES test/test_controller_spawner_with_type.yaml
   DESTINATION test)