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

Add NAMESPACE support to ament_export_targets #498

Merged
merged 3 commits into from
Feb 7, 2024
Merged

Add NAMESPACE support to ament_export_targets #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71a967f
Add NAMESPACE support to ament_export_targets
Ryanf55 Jan 19, 2024
5348e0e
Remove whitespace changes
Ryanf55 Feb 2, 2024
41c8b21
Improve documentation for NAMESPACE argument
Ryanf55 Feb 2, 2024
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
2 changes: 1 addition & 1 deletion ament_cmake_export_targets/cmake/ament_cmake_export_targets_package_hook.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(NOT _AMENT_CMAKE_EXPORT_TARGETS STREQUAL "")
install(
EXPORT "${_target}"
DESTINATION share/${PROJECT_NAME}/cmake
NAMESPACE "${PROJECT_NAME}::"
NAMESPACE "${_AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE}"
FILE "${_target}Export.cmake"
)
endforeach()
Expand Down
16 changes: 14 additions & 2 deletions ament_cmake_export_targets/cmake/ament_export_targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@
# Export targets to downstream packages.
#
# Each export name must have been used to install targets using
# ``install(TARGETS ... EXPORT name ...)``.
# ``install(TARGETS ... EXPORT name NAMESPACE my_namespace ...)``.
# The ``install(EXPORT ...)`` invocation is handled by this macros.
#
# :param HAS_LIBRARY_TARGET: if set, an environment variable will be defined
# so that the library can be found at runtime
# :type HAS_LIBRARY_TARGET: option
# :keyword NAMESPACE: the exported namespace for the target if set.
# The default is the value of ``${PROJECT_NAME}::``.
# This is an advanced option. It should be used carefully and clearly documented
# in a usage guide for any package that makes use of this option.
# :type NAMESPACE: string
# :param ARGN: a list of export names
# :type ARGN: list of strings
#
Expand All @@ -32,14 +37,21 @@ macro(ament_export_targets)
message(FATAL_ERROR
"ament_export_targets() must be called before ament_package()")
endif()
cmake_parse_arguments(_ARG "HAS_LIBRARY_TARGET" "" "" ${ARGN})
cmake_parse_arguments(_ARG "HAS_LIBRARY_TARGET" "NAMESPACE" "" ${ARGN})

if(${ARGC} GREATER 0)
_ament_cmake_export_targets_register_package_hook()
foreach(_arg ${_ARG_UNPARSED_ARGUMENTS})
list(APPEND _AMENT_CMAKE_EXPORT_TARGETS "${_arg}")
endforeach()

set(_AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE ${_ARG_NAMESPACE})

# Allow optionally overriding default namespace
if(NOT DEFINED _AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE)
set(_AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE "${PROJECT_NAME}::")
endif()

# if the export name contains is a library target
# make sure to register an environment hook
if(${_ARG_HAS_LIBRARY_TARGET})
Expand Down