Skip to content

Commit ee67511

Browse files
EugenioColladoEugenioCollado
committed
Fix cyclic dependency
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
1 parent 59815fd commit ee67511

1 file changed

Lines changed: 0 additions & 112 deletions

File tree

‎patches/ros2-core-generators-to-default-generators.patch‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,6 @@ index b5f34b9..65db062 100644
1111
find_package(unique_identifier_msgs REQUIRED)
1212

1313
set(msg_files
14-
@@ -39,6 +39,6 @@ if(BUILD_TESTING)
15-
ament_lint_auto_find_test_dependencies()
16-
endif()
17-
18-
-ament_export_dependencies(rosidl_core_runtime)
19-
+ament_export_dependencies(rosidl_default_runtime)
20-
21-
ament_package()
22-
diff --git a/ros2/rcl_interfaces/action_msgs/package.xml b/ros2/rcl_interfaces/action_msgs/package.xml
23-
index 2b0fca7..006029b 100644
24-
--- a/ros2/rcl_interfaces/action_msgs/package.xml
25-
+++ b/ros2/rcl_interfaces/action_msgs/package.xml
26-
@@ -15,13 +15,13 @@
27-
<author email="michel@ekumenlabs.com">Michel Hidalgo</author>
28-
29-
<buildtool_depend>ament_cmake</buildtool_depend>
30-
- <buildtool_depend>rosidl_core_generators</buildtool_depend>
31-
+ <buildtool_depend>rosidl_default_generators</buildtool_depend>
32-
33-
<depend>builtin_interfaces</depend>
34-
<depend>service_msgs</depend>
35-
<depend>unique_identifier_msgs</depend>
36-
37-
- <exec_depend>rosidl_core_runtime</exec_depend>
38-
+ <exec_depend>rosidl_default_runtime</exec_depend>
39-
40-
<test_depend>ament_lint_auto</test_depend>
41-
<test_depend>ament_lint_common</test_depend>
4214
diff --git a/ros2/rcl_interfaces/builtin_interfaces/CMakeLists.txt b/ros2/rcl_interfaces/builtin_interfaces/CMakeLists.txt
4315
index 282d38e..67c1339 100644
4416
--- a/ros2/rcl_interfaces/builtin_interfaces/CMakeLists.txt
@@ -49,33 +21,6 @@ index 282d38e..67c1339 100644
4921
# because ROS actions depend on this package
5022
-find_package(rosidl_core_generators REQUIRED)
5123
+find_package(rosidl_default_generators REQUIRED)
52-
53-
rosidl_generate_interfaces(${PROJECT_NAME}
54-
"msg/Duration.msg"
55-
@@ -22,6 +22,6 @@ rosidl_generate_interfaces(${PROJECT_NAME}
56-
ADD_LINTER_TESTS
57-
)
58-
59-
-ament_export_dependencies(rosidl_core_runtime)
60-
+ament_export_dependencies(rosidl_default_runtime)
61-
62-
ament_package()
63-
diff --git a/ros2/rcl_interfaces/builtin_interfaces/package.xml b/ros2/rcl_interfaces/builtin_interfaces/package.xml
64-
index 57540d0..2116b3e 100644
65-
--- a/ros2/rcl_interfaces/builtin_interfaces/package.xml
66-
+++ b/ros2/rcl_interfaces/builtin_interfaces/package.xml
67-
@@ -15,9 +15,9 @@
68-
69-
<buildtool_depend>ament_cmake</buildtool_depend>
70-
71-
- <buildtool_depend>rosidl_core_generators</buildtool_depend>
72-
+ <buildtool_depend>rosidl_default_generators</buildtool_depend>
73-
74-
- <exec_depend>rosidl_core_runtime</exec_depend>
75-
+ <exec_depend>rosidl_default_runtime</exec_depend>
76-
77-
<test_depend>ament_lint_common</test_depend>
78-
7924
diff --git a/ros2/rcl_interfaces/type_description_interfaces/CMakeLists.txt b/ros2/rcl_interfaces/type_description_interfaces/CMakeLists.txt
8025
index c3ac72b..4374456 100644
8126
--- a/ros2/rcl_interfaces/type_description_interfaces/CMakeLists.txt
@@ -86,35 +31,6 @@ index c3ac72b..4374456 100644
8631
# because other generators depend on this.
8732
-find_package(rosidl_core_generators REQUIRED)
8833
+find_package(rosidl_default_generators REQUIRED)
89-
90-
rosidl_generate_interfaces(${PROJECT_NAME}
91-
"msg/Field.msg"
92-
@@ -31,6 +31,6 @@ if(BUILD_TESTING)
93-
ament_lint_auto_find_test_dependencies()
94-
endif()
95-
96-
-ament_export_dependencies(rosidl_core_runtime)
97-
+ament_export_dependencies(rosidl_default_runtime)
98-
99-
ament_package()
100-
diff --git a/ros2/rcl_interfaces/type_description_interfaces/package.xml b/ros2/rcl_interfaces/type_description_interfaces/package.xml
101-
index 3c17a88..72813cb 100644
102-
--- a/ros2/rcl_interfaces/type_description_interfaces/package.xml
103-
+++ b/ros2/rcl_interfaces/type_description_interfaces/package.xml
104-
@@ -11,11 +11,11 @@
105-
106-
<buildtool_depend>ament_cmake</buildtool_depend>
107-
108-
- <buildtool_depend>rosidl_core_generators</buildtool_depend>
109-
+ <buildtool_depend>rosidl_default_generators</buildtool_depend>
110-
111-
<depend>service_msgs</depend>
112-
113-
- <exec_depend>rosidl_core_runtime</exec_depend>
114-
+ <exec_depend>rosidl_default_runtime</exec_depend>
115-
116-
<test_depend>ament_lint_auto</test_depend>
117-
<test_depend>ament_lint_common</test_depend>
11834
diff --git a/ros2/unique_identifier_msgs/CMakeLists.txt b/ros2/unique_identifier_msgs/CMakeLists.txt
11935
index 382b8ec..00498c3 100644
12036
--- a/ros2/unique_identifier_msgs/CMakeLists.txt
@@ -125,31 +41,3 @@ index 382b8ec..00498c3 100644
12541
# because ROS actions depend on this package
12642
-find_package(rosidl_core_generators REQUIRED)
12743
+find_package(rosidl_default_generators REQUIRED)
128-
129-
set(msg_files
130-
"msg/UUID.msg"
131-
@@ -23,7 +23,7 @@ set(msg_files
132-
133-
rosidl_generate_interfaces(${PROJECT_NAME} ${msg_files})
134-
135-
-ament_export_dependencies(rosidl_core_runtime)
136-
+ament_export_dependencies(rosidl_default_runtime)
137-
138-
if(BUILD_TESTING)
139-
find_package(ament_lint_auto REQUIRED)
140-
diff --git a/ros2/unique_identifier_msgs/package.xml b/ros2/unique_identifier_msgs/package.xml
141-
index 95509ca..2e8f4e4 100644
142-
--- a/ros2/unique_identifier_msgs/package.xml
143-
+++ b/ros2/unique_identifier_msgs/package.xml
144-
@@ -19,9 +19,9 @@
145-
146-
<buildtool_depend>ament_cmake</buildtool_depend>
147-
148-
- <buildtool_depend>rosidl_core_generators</buildtool_depend>
149-
+ <buildtool_depend>rosidl_default_generators</buildtool_depend>
150-
151-
- <exec_depend>rosidl_core_runtime</exec_depend>
152-
+ <exec_depend>rosidl_default_runtime</exec_depend>
153-
154-
<test_depend>ament_lint_auto</test_depend>
155-
<test_depend>ament_lint_common</test_depend>

0 commit comments

Comments
 (0)