Fix typesupports not being found issue

Signed-off-by: Ivan Santiago Paunovic <[email protected]>

Author: ivanpauno

rosidl_generator_java/cmake/rosidl_generator_java_generate_interfaces.cmake

@@ -15,6 +15,7 @@
 find_package(ament_cmake_export_jars REQUIRED)
 find_package(ament_cmake_export_jni_libraries REQUIRED)
 find_package(rosidl_generator_c REQUIRED)
+find_package(rosidl_typesupport_c REQUIRED)
 find_package(rmw_implementation_cmake REQUIRED)
 find_package(rmw REQUIRED)
 find_package(rcljava_common REQUIRED)

rosidl_generator_java/cmake/rosidl_generator_java_get_typesupports.cmake

@@ -12,19 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-macro(accumulate_typesupports)
-  set(_typesupport_impl_tmp "")
-  get_rmw_typesupport(_typesupport_impl_tmp ${rmw_implementation} LANGUAGE "C")
-  list(APPEND _typesupport_impls_tmp ${_typesupport_impl_tmp})
-endmacro()
-
 macro(rosidl_generator_java_get_typesupports TYPESUPPORT_IMPLS)
   set(${TYPESUPPORT_IMPLS} "")
-  set(_typesupport_impls_tmp "")
-  set(_typesupport_impls_tmp_unique "")
-  call_for_each_rmw_implementation(accumulate_typesupports)
-
-  foreach(_typesupport_impl ${_typesupport_impls_tmp})
-    list_append_unique(${TYPESUPPORT_IMPLS} ${_typesupport_impl})
+  ament_index_get_resources(${TYPESUPPORT_IMPLS} "rosidl_typesupport_c")
+  list(APPEND ${TYPESUPPORT_IMPLS} "rosidl_typesupport_c")
+  foreach(_typesupport ${${TYPESUPPORT_IMPLS}})
+    find_package(${_typesupport} QUIET)
+    if(NOT ${_typesupport}_FOUND)
+      list(REMOVE_ITEM ${TYPESUPPORT_IMPLS} "${_typesupport}")
+    endif()
   endforeach()
 endmacro()