From 1e852aaaeb835f2741a8dc1f36b67e255711055f Mon Sep 17 00:00:00 2001
From: ahcorde <ahcorde@gmail.com>
Date: Fri, 14 Feb 2020 19:33:38 +0100
Subject: [PATCH 1/3] rclcpp_action removed rosidl_generator_cpp and
 rosidl_generator_c dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
---
 rclcpp_action/CMakeLists.txt | 6 +-----
 rclcpp_action/package.xml    | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/rclcpp_action/CMakeLists.txt b/rclcpp_action/CMakeLists.txt
index 6b84077155..28da8a62e8 100644
--- a/rclcpp_action/CMakeLists.txt
+++ b/rclcpp_action/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(ament_cmake_ros REQUIRED)
 find_package(action_msgs REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(rcl_action REQUIRED)
-find_package(rosidl_generator_cpp REQUIRED)
 
 # Default to C++14
 if(NOT CMAKE_CXX_STANDARD)
@@ -33,8 +32,7 @@ ament_target_dependencies(${PROJECT_NAME}
   "action_msgs"
   "rcl_action"
   "rclcpp"
-  "rosidl_generator_c"
-  "rosidl_generator_cpp")
+)
 
 # Causes the visibility macros to use dllexport rather than dllimport,
 # which is appropriate when building the dll but not consuming it.
@@ -60,8 +58,6 @@ ament_export_dependencies(ament_cmake)
 ament_export_dependencies(action_msgs)
 ament_export_dependencies(rclcpp)
 ament_export_dependencies(rcl_action)
-ament_export_dependencies(rosidl_generator_c)
-ament_export_dependencies(rosidl_generator_cpp)
 
 if(BUILD_TESTING)
   find_package(ament_cmake_gtest REQUIRED)
diff --git a/rclcpp_action/package.xml b/rclcpp_action/package.xml
index 199d6b1371..d62f4491f5 100644
--- a/rclcpp_action/package.xml
+++ b/rclcpp_action/package.xml
@@ -9,12 +9,6 @@
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
-  <build_export_depend>rosidl_generator_cpp</build_export_depend>
-  <build_export_depend>rosidl_generator_c</build_export_depend>
-
-  <build_depend>rosidl_generator_c</build_depend>
-  <build_depend>rosidl_generator_cpp</build_depend>
-
   <depend>action_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rcl_action</depend>

From 6cc86e1f3cb3d30c703172d938fc242760aea544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= <ahcorde@gmail.com>
Date: Fri, 14 Feb 2020 21:31:45 +0100
Subject: [PATCH 2/3] rclcpp_action restored rosidl_generator_c dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
---
 rclcpp_action/CMakeLists.txt | 3 +++
 rclcpp_action/package.xml    | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/rclcpp_action/CMakeLists.txt b/rclcpp_action/CMakeLists.txt
index 28da8a62e8..baaf4dcb92 100644
--- a/rclcpp_action/CMakeLists.txt
+++ b/rclcpp_action/CMakeLists.txt
@@ -6,6 +6,7 @@ find_package(ament_cmake_ros REQUIRED)
 find_package(action_msgs REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(rcl_action REQUIRED)
+find_package(rosidl_generator_c REQUIRED)
 
 # Default to C++14
 if(NOT CMAKE_CXX_STANDARD)
@@ -31,6 +32,7 @@ add_library(${PROJECT_NAME}
 ament_target_dependencies(${PROJECT_NAME}
   "action_msgs"
   "rcl_action"
+  "rosidl_generator_c"
   "rclcpp"
 )
 
@@ -58,6 +60,7 @@ ament_export_dependencies(ament_cmake)
 ament_export_dependencies(action_msgs)
 ament_export_dependencies(rclcpp)
 ament_export_dependencies(rcl_action)
+ament_export_dependencies(rosidl_generator_c)
 
 if(BUILD_TESTING)
   find_package(ament_cmake_gtest REQUIRED)
diff --git a/rclcpp_action/package.xml b/rclcpp_action/package.xml
index d62f4491f5..faebb55003 100644
--- a/rclcpp_action/package.xml
+++ b/rclcpp_action/package.xml
@@ -9,6 +9,10 @@
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
+  <build_export_depend>rosidl_generator_c</build_export_depend>
+
+  <build_depend>rosidl_generator_c</build_depend>
+
   <depend>action_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rcl_action</depend>

From 92d149411abfc2f622c65f7b4f1767afa98a155c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= <ahcorde@gmail.com>
Date: Fri, 14 Feb 2020 21:48:17 +0100
Subject: [PATCH 3/3] rclcpp action alpha order CMakeLists.txt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
---
 rclcpp_action/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rclcpp_action/CMakeLists.txt b/rclcpp_action/CMakeLists.txt
index baaf4dcb92..c19b371456 100644
--- a/rclcpp_action/CMakeLists.txt
+++ b/rclcpp_action/CMakeLists.txt
@@ -32,8 +32,8 @@ add_library(${PROJECT_NAME}
 ament_target_dependencies(${PROJECT_NAME}
   "action_msgs"
   "rcl_action"
-  "rosidl_generator_c"
   "rclcpp"
+  "rosidl_generator_c"
 )
 
 # Causes the visibility macros to use dllexport rather than dllimport,