Skip to content

Commit fdbf457

Browse files
authored
More specific prefix in some cmake_parse_argument calls (#523)
Signed-off-by: Kevin Egger <[email protected]>
1 parent 1388e09 commit fdbf457

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ament_cmake_auto/cmake/ament_auto_package.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#
4444

4545
macro(ament_auto_package)
46-
cmake_parse_arguments(_ARG "INSTALL_TO_PATH" "" "INSTALL_TO_SHARE" ${ARGN})
46+
cmake_parse_arguments(_ARG_AMENT_AUTO_PACKAGE "INSTALL_TO_PATH" "" "INSTALL_TO_SHARE" ${ARGN})
4747
# passing all unparsed arguments to ament_package()
4848

4949
# export all found build dependencies which are also run dependencies
@@ -86,7 +86,7 @@ macro(ament_auto_package)
8686

8787
# install all executables
8888
if(NOT ${PROJECT_NAME}_EXECUTABLES STREQUAL "")
89-
if(_ARG_INSTALL_TO_PATH)
89+
if(_ARG_AMENT_AUTO_PACKAGE_INSTALL_TO_PATH)
9090
set(_destination "bin")
9191
else()
9292
set(_destination "lib/${PROJECT_NAME}")
@@ -98,7 +98,7 @@ macro(ament_auto_package)
9898
endif()
9999

100100
# install directories to share
101-
foreach(_dir ${_ARG_INSTALL_TO_SHARE})
101+
foreach(_dir ${_ARG_AMENT_AUTO_PACKAGE_INSTALL_TO_SHARE})
102102
install(
103103
DIRECTORY "${_dir}"
104104
DESTINATION "share/${PROJECT_NAME}"
@@ -107,5 +107,5 @@ macro(ament_auto_package)
107107

108108
ament_execute_extensions(ament_auto_package)
109109

110-
ament_package(${_ARG_UNPARSED_ARGUMENTS})
110+
ament_package(${_ARG_AMENT_AUTO_PACKAGE_UNPARSED_ARGUMENTS})
111111
endmacro()

ament_cmake_core/cmake/core/ament_execute_extensions.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
# @public
2424
#
2525
macro(ament_execute_extensions extension_point)
26-
cmake_parse_arguments(_ARG "" "" "EXCLUDE" ${ARGN})
27-
if(_ARG_UNPARSED_ARGUMENTS)
26+
cmake_parse_arguments(_ARG_AMENT_EXECUTE_EXTENSIONS "" "" "EXCLUDE" ${ARGN})
27+
if(_ARG_AMENT_EXECUTE_EXTENSIONS_UNPARSED_ARGUMENTS)
2828
message(FATAL_ERROR "ament_execute_extensions() called with "
29-
"unused arguments: ${_ARG_UNPARSED_ARGUMENTS}")
29+
"unused arguments: ${_ARG_AMENT_EXECUTE_EXTENSIONS_UNPARSED_ARGUMENTS}")
3030
endif()
3131
if(AMENT_EXTENSIONS_${extension_point})
3232
foreach(_extension ${AMENT_EXTENSIONS_${extension_point}})
@@ -38,7 +38,7 @@ macro(ament_execute_extensions extension_point)
3838
"name and cmake filename")
3939
endif()
4040
list(GET _extension_list 0 _pkg_name)
41-
if("${_pkg_name}" IN_LIST _ARG_EXCLUDE)
41+
if("${_pkg_name}" IN_LIST _ARG_AMENT_EXECUTE_EXTENSIONS_EXCLUDE)
4242
continue()
4343
endif()
4444
list(GET _extension_list 1 _cmake_filename)

0 commit comments

Comments
 (0)