Try to fix returning a list of rmw typesupports

ros2 · Apr 13, 2016 · 12b9777 · dirk-thomas · Apr 13, 2016 · 12b9777
1 parent 54c5c6b
commit 12b9777
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/rmw/cmake/get_rmw_typesupport.cmake b/rmw/cmake/get_rmw_typesupport.cmake
@@ -26,7 +26,10 @@ macro(get_rmw_typesupport var rmw_implementation)
     message(FATAL_ERROR "get_rmw_typesupport() called with unused arguments: ${ARGN}")
   endif()
 
-  ament_index_get_resource(${var} "rmw_typesupport" "${rmw_implementation}")
+  ament_index_get_resource(${c_typesupport} "rmw_typesupport")
+  ament_index_get_resource(${cpp_typesupport} "rmw_typesupport")
+  list(APPEND ${var} ${c_typesupport})
+  list(APPEND ${var} ${cpp_typesupport})
 endmacro()
 
 #

diff --git a/rmw_implementation_cmake/cmake/get_available_rmw_implementations.cmake b/rmw_implementation_cmake/cmake/get_available_rmw_implementations.cmake
@@ -19,7 +19,11 @@
 # :type var: list of strings
 #
 function(get_available_rmw_implementations var)
-  ament_index_get_resources(middleware_implementations "rmw_typesupport")
+  ament_index_get_resources(impl_with_c_typesupport "rmw_typesupport_c")
+  ament_index_get_resources(impl_with_cpp_typesupport "rmw_typesupport_cpp")
+  # Concatenate lists
+  list_append_unique(middleware_implementations ${impl_with_c_typesupport})
+  list_append_unique(${middleware_implementations} ${impl_with_cpp_typesupport})
   if(DEFINED middleware_implementations)
     list(SORT middleware_implementations)
   endif()