From 8bbc72df332962938e7be78a6cb21f409f92c9e8 Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Fri, 1 May 2020 11:27:31 -0700
Subject: [PATCH 1/2] change rmw_implementation deps to be buildtool and not
 exec

Signed-off-by: William Woodall <wjwwood@google.com>
---
 rmw_implementation/package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rmw_implementation/package.xml b/rmw_implementation/package.xml
index ccc67792..b966ca3e 100644
--- a/rmw_implementation/package.xml
+++ b/rmw_implementation/package.xml
@@ -31,7 +31,8 @@
   <build_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rmw_fastrtps_dynamic_cpp</build_depend>
   <build_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rmw_zenoh_cpp</build_depend>
 
-  <depend>rmw_implementation_cmake</depend>
+  <buildtool_depend>rmw_implementation_cmake</buildtool_depend>
+  <buildtool_export_depend>rmw_implementation_cmake</buildtool_export_depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>

From da04d02a9d36e1927444b660d34b12dd274eacdd Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Thu, 25 Jun 2020 10:17:47 -0700
Subject: [PATCH 2/2] fixup dependencies

Signed-off-by: William Woodall <william@osrfoundation.org>
---
 rmw_implementation/package.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rmw_implementation/package.xml b/rmw_implementation/package.xml
index b966ca3e..9f005bd6 100644
--- a/rmw_implementation/package.xml
+++ b/rmw_implementation/package.xml
@@ -18,6 +18,7 @@
   <buildtool_depend>ament_cmake_ros_core</buildtool_depend>
   <buildtool_depend>rmw_implementation_cmake</buildtool_depend>
   <buildtool_export_depend>ament_cmake_ros_core</buildtool_export_depend>
+  <buildtool_export_depend>rmw_implementation_cmake</buildtool_export_depend>
 
   <depend>ament_index_cpp</depend>
   <depend>rcpputils</depend>
@@ -31,9 +32,6 @@
   <build_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rmw_fastrtps_dynamic_cpp</build_depend>
   <build_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rmw_zenoh_cpp</build_depend>
 
-  <buildtool_depend>rmw_implementation_cmake</buildtool_depend>
-  <buildtool_export_depend>rmw_implementation_cmake</buildtool_export_depend>
-
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>