Skip to content

Commit b62e8c4

Browse files
mergify[bot]Jonathan Sellingsloretz
authored
Use target output name for exporting typesupport library (#625) (#639)
Signed-off-by: Jonathan Selling <[email protected]> (cherry picked from commit e76ed13) Co-authored-by: Jonathan Selling <[email protected]> Co-authored-by: Shane Loretz <[email protected]>
1 parent c27650f commit b62e8c4

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

rosidl_cmake/cmake/rosidl_export_typesupport_libraries.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,13 @@ macro(rosidl_export_typesupport_libraries library_suffix)
4545
"not-imported targets")
4646
endif()
4747

48-
list(APPEND _ROSIDL_CMAKE_EXPORT_TYPESUPPORT_LIBRARIES "${library_suffix}:${_lib}")
48+
get_target_property(_lib_name "${_lib}" OUTPUT_NAME)
49+
50+
if(NOT _lib_name)
51+
set(_lib_name ${_lib})
52+
endif()
53+
54+
list(APPEND _ROSIDL_CMAKE_EXPORT_TYPESUPPORT_LIBRARIES "${library_suffix}:${_lib_name}")
4955
endforeach()
5056
endif()
5157
endmacro()

0 commit comments

Comments
 (0)