Skip to content

Commit d29798e

Browse files
committed
Support multiple SCRIPTS_DESTINATIONs
For example, xacro is install into lib/xacro/xacro and bin/xacro. Signed-off-by: Robert Haschke <[email protected]>
1 parent fe6b3a3 commit d29798e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ament_cmake_python/cmake/ament_python_install_package.cmake

+6-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ endmacro()
4141

4242
function(_ament_cmake_python_install_package package_name)
4343
cmake_parse_arguments(
44-
ARG "SKIP_COMPILE" "PACKAGE_DIR;VERSION;SETUP_CFG;DESTINATION;SCRIPTS_DESTINATION" "" ${ARGN})
44+
ARG "SKIP_COMPILE" "PACKAGE_DIR;VERSION;SETUP_CFG;DESTINATION" "SCRIPTS_DESTINATION" ${ARGN})
4545
if(ARG_UNPARSED_ARGUMENTS)
4646
message(FATAL_ERROR "ament_python_install_package() called with unused "
4747
"arguments: ${ARG_UNPARSED_ARGUMENTS}")
@@ -166,9 +166,11 @@ setup(
166166
endif()
167167

168168
# generate/install entry-point console scripts
169-
get_filename_component(ABS_SCRIPTS_DESTINATION "${ARG_SCRIPTS_DESTINATION}" ABSOLUTE BASE_DIR "${CMAKE_INSTALL_PREFIX}")
170-
install(CODE "execute_process(COMMAND ${python_interpreter} setup.py install_scripts --install-dir \"${ABS_SCRIPTS_DESTINATION}\"
171-
WORKING_DIRECTORY \"${build_dir}\")")
169+
foreach(_dest ${ARG_SCRIPTS_DESTINATION})
170+
get_filename_component(ABS_SCRIPTS_DESTINATION "${_dest}" ABSOLUTE BASE_DIR "${CMAKE_INSTALL_PREFIX}")
171+
install(CODE "execute_process(COMMAND ${python_interpreter} setup.py install_scripts --install-dir \"${ABS_SCRIPTS_DESTINATION}\"
172+
WORKING_DIRECTORY \"${build_dir}\")")
173+
endforeach()
172174

173175
install(
174176
DIRECTORY "${ARG_PACKAGE_DIR}/"

0 commit comments

Comments
 (0)