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

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

diff --git a/rcl/package.xml b/rcl/package.xml
index f285e9383..6c5793f8e 100644
--- a/rcl/package.xml
+++ b/rcl/package.xml
@@ -23,7 +23,6 @@
   <depend>libyaml_vendor</depend>
   <depend>rcl_interfaces</depend>
   <depend>rcl_logging_interface</depend>
-  <depend>rcl_logging_spdlog</depend> <!-- the default logging impl -->
   <depend>rcl_yaml_param_parser</depend>
   <depend>rcutils</depend>
   <depend>rmw_implementation</depend>
@@ -33,6 +32,9 @@
   <depend>type_description_interfaces</depend>
   <depend>yaml</depend>
 
+  <!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
+  <depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rcl_logging_spdlog</depend>
+
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>