Skip to content

add CONFIG_EXTRAS_POST to ament_package() #123

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

Merged
dirk-thomas merged 1 commit into from
Mar 22, 2018
Merged

add CONFIG_EXTRAS_POST to ament_package() #123

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
20 changes: 17 additions & 3 deletions ament_cmake_core/cmake/core/ament_package.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,17 @@
# a template which is expanded using configure_file() (ending in
# '.cmake.in') with @ONLY.
# If the global variable ${PROJECT_NAME}_CONFIG_EXTRAS is set it
# will be prepended to the explicitly passed argument.
# will be appended to the explicitly passed argument.
# :type CONFIG_EXTRAS: list of files
# :param CONFIG_EXTRAS_POST: a list of CMake files containing extra
# stuff that should be accessible to users of this package after
# ``find_package``\ -ing it.
# The file can either be a plain CMake file (ending in '.cmake') or
# a template which is expanded using configure_file() (ending in
# '.cmake.in') with @ONLY.
# If the global variable ${PROJECT_NAME}_CONFIG_EXTRAS_POST is set it
# will be prepended to the explicitly passed argument.
# :type CONFIG_EXTRAS_POST: list of files
#
# @public
#
Expand Down Expand Up @@ -60,7 +69,7 @@ macro(ament_package)
endmacro()

function(_ament_package)
cmake_parse_arguments(PACKAGE "" "" "CONFIG_EXTRAS" ${ARGN})
cmake_parse_arguments(PACKAGE "" "" "CONFIG_EXTRAS;CONFIG_EXTRAS_POST" ${ARGN})
if(PACKAGE_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "ament_package() called with unused arguments: "
"${PACKAGE_UNPARSED_ARGUMENTS}")
Expand All @@ -72,7 +81,12 @@ function(_ament_package)

# expand and install config extras
set(PACKAGE_CONFIG_EXTRA_FILES "")
foreach(extra ${PACKAGE_CONFIG_EXTRAS} ${${PROJECT_NAME}_CONFIG_EXTRAS})
foreach(
extra
${PACKAGE_CONFIG_EXTRAS}
${${PROJECT_NAME}_CONFIG_EXTRAS}
${PACKAGE_CONFIG_EXTRAS_POST}
)
assert_file_exists("${extra}"
"ament_package() called with extra file '${extra}' which does not exist")
stamp("${extra}")
Expand Down