Allow single typessuport

Signed-off-by: Your Name <you@example.com>
ros2 · May 21, 2021 · be9c031 · be9c031
1 parent cdbd44d
commit be9c031
Showing 1 changed file with 28 additions and 11 deletions.
diff --git a/rosidl_typesupport_c/cmake/rosidl_typesupport_c_generate_interfaces.cmake b/rosidl_typesupport_c/cmake/rosidl_typesupport_c_generate_interfaces.cmake
@@ -119,17 +119,19 @@ target_include_directories(${rosidl_generate_interfaces_TARGET}${_target_suffix}
 # if only a single typesupport is used this package will directly reference it
 # therefore it needs to link against the selected typesupport
 if(NOT typesupports MATCHES ";")
+  set(SINGLE_TYPE_SUPPORT ON)
   target_include_directories(${rosidl_generate_interfaces_TARGET}${_target_suffix}
     PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${typesupports}>")
   target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix}
     ${rosidl_generate_interfaces_TARGET}__${typesupports})
 else()
+  set(SINGLE_TYPE_SUPPORT OFF)
   if("${rosidl_typesupport_c_LIBRARY_TYPE}" STREQUAL "STATIC")
-  target_compile_definitions(${rosidl_generate_interfaces_TARGET}${_target_suffix}
-    PRIVATE
-    ROSIDL_TYPESUPPORT_STATIC_TYPESUPPORT
-  )
+    target_compile_definitions(${rosidl_generate_interfaces_TARGET}${_target_suffix}
+      PRIVATE
+      ROSIDL_TYPESUPPORT_STATIC_TYPESUPPORT
+    )
   endif()
 endif()
 
@@ -157,13 +159,28 @@ add_dependencies(
 )
 
 if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
-  install(
-    TARGETS ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-    EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION bin
-  )
+  if(SINGLE_TYPE_SUPPORT)
+    install(
+      TARGETS
+        ${rosidl_generate_interfaces_TARGET}${_target_suffix}
+        ${rosidl_generate_interfaces_TARGET}__${typesupports}
+      EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
+      ARCHIVE DESTINATION lib
+      LIBRARY DESTINATION lib
+      RUNTIME DESTINATION bin
+    )
+  else()
+    install(
+      TARGETS
+        ${rosidl_generate_interfaces_TARGET}${_target_suffix}
+      EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
+      ARCHIVE DESTINATION lib
+      LIBRARY DESTINATION lib
+      RUNTIME DESTINATION bin
+    )
+  endif()
+
+
   ament_export_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix})
   ament_export_targets(${rosidl_generate_interfaces_TARGET}${_target_suffix})
 endif()