Force extension points to be registered in order

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
ros2 · May 12, 2020 · 45d2326 · 45d2326
1 parent afff057
commit 45d2326
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/rosidl_typesupport_introspection_c/package.xml b/rosidl_typesupport_introspection_c/package.xml
@@ -13,6 +13,7 @@
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
   <buildtool_export_depend>rosidl_cmake</buildtool_export_depend>
+  <buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>
 
   <build_export_depend>rosidl_runtime_c</build_export_depend>
 

diff --git a/rosidl_typesupport_introspection_c/rosidl_typesupport_introspection_c-extras.cmake.in b/rosidl_typesupport_introspection_c/rosidl_typesupport_introspection_c-extras.cmake.in
@@ -7,6 +7,8 @@ set(rosidl_typesupport_introspection_c_LIBRARY_TYPE
   "@rosidl_typesupport_introspection_c_LIBRARY_TYPE@")
 
 find_package(ament_cmake_core QUIET REQUIRED)
+# Make sure rosidl_generator_c extension point is registered first
+find_package(rosidl_generator_c QUIET REQUIRED)
 ament_register_extension(
   "rosidl_generate_idl_interfaces"
   "rosidl_typesupport_introspection_c"

diff --git a/rosidl_typesupport_introspection_cpp/package.xml b/rosidl_typesupport_introspection_cpp/package.xml
@@ -13,6 +13,7 @@
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
   <buildtool_export_depend>rosidl_cmake</buildtool_export_depend>
+  <buildtool_export_depend>rosidl_generator_cpp</buildtool_export_depend>
 
   <build_export_depend>rosidl_runtime_c</build_export_depend>
   <build_export_depend>rosidl_runtime_cpp</build_export_depend>

diff --git a/rosidl_typesupport_introspection_cpp/rosidl_typesupport_introspection_cpp-extras.cmake.in b/rosidl_typesupport_introspection_cpp/rosidl_typesupport_introspection_cpp-extras.cmake.in
@@ -7,6 +7,10 @@ set(rosidl_typesupport_introspection_cpp_LIBRARY_TYPE
   "@rosidl_typesupport_introspection_cpp_LIBRARY_TYPE@")
 
 find_package(ament_cmake_core QUIET REQUIRED)
+
+# Make sure extension points are registered in order
+find_package(rosidl_generator_cpp QUIET REQUIRED)
+
 ament_register_extension(
   "rosidl_generate_idl_interfaces"
   "rosidl_typesupport_introspection_cpp"