From 8751ff4cd9060157831dcaeecd89611932aec608 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Wed, 5 Jun 2024 13:53:21 -0500
Subject: [PATCH] Add mechanism to disable workaround for dependency groups
 (#397)

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

diff --git a/ros2launch/package.xml b/ros2launch/package.xml
index ca8ab985..1bc8e1b4 100644
--- a/ros2launch/package.xml
+++ b/ros2launch/package.xml
@@ -25,9 +25,9 @@
   <depend>ros2cli</depend>
   <depend>ros2pkg</depend>
 
-  <!-- explicitly depend on the main launch frontends -->
-  <exec_depend>launch_xml</exec_depend>
-  <exec_depend>launch_yaml</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>