From 4c18be043ad77590cbb76654a890e490a1828699 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Tue, 23 Apr 2024 16:06:20 -0500
Subject: [PATCH] Add mechanism to disable workaround for dependency groups

Signed-off-by: Scott K Logan <logans@cottsay.net>
---
 launch_testing/package.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/launch_testing/package.xml b/launch_testing/package.xml
index ca7bdf96..87663399 100644
--- a/launch_testing/package.xml
+++ b/launch_testing/package.xml
@@ -19,12 +19,13 @@
 
   <exec_depend>ament_index_python</exec_depend>
   <exec_depend>launch</exec_depend>
-  <!-- explicitly depend on the main launch frontends -->
-  <exec_depend>launch_xml</exec_depend>
-  <exec_depend>launch_yaml</exec_depend>
   <exec_depend>osrf_pycommon</exec_depend>
   <exec_depend>python3-pytest</exec_depend>
 
+  <!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
+  <exec_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">launch_xml</exec_depend>
+  <exec_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">launch_yaml</exec_depend>
+
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>