Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use OUTPUT_NAME of exported library if set #239

Merged
merged 1 commit into from
Apr 10, 2020
Merged

use OUTPUT_NAME of exported library if set #239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ament_cmake_export_libraries/cmake/ament_export_libraries.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ macro(ament_export_libraries)
# they will be resolved via find_library()
# relative to the CMAKE_INSTALL_PREFIX
# when find_package() is invoked from a downstream package
list(APPEND _AMENT_EXPORT_LIBRARIES ${_cfg} "${_lib}")
get_target_property(_output_name ${_lib} OUTPUT_NAME)
if(_output_name)
list(APPEND _AMENT_EXPORT_LIBRARIES ${_cfg} "${_output_name}")
else()
list(APPEND _AMENT_EXPORT_LIBRARIES ${_cfg} "${_lib}")
endif()
endif()
else()
# keep plain library names as-is
Expand Down