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

prefix install target with project name #1019

Merged
merged 3 commits into from
Jul 30, 2019
Merged

prefix install target with project name #1019

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
29a99ac
prefix install target with project name
kejxu Jul 30, 2019
23fa571
update comment
dirk-thomas Jul 30, 2019
c759149
update comment
dirk-thomas Jul 30, 2019
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
3 changes: 2 additions & 1 deletion cmake/catkin_install_python.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ function(catkin_install_python signature)

get_filename_component(name "${file}" NAME)
add_python_executable(SCRIPT_NAME ${name}
TARGET_NAME ${name}_executable_install_python
# prefix with project name to avoid collisions across packages
TARGET_NAME ${PROJECT_NAME}_${name}_exec_install_python
DESTINATION "${ARG_DESTINATION}")
elseif(NOT ARG_OPTIONAL)
message(FATAL_ERROR "catkin_install_python() called with non-existing file '${file}'.")
Expand Down
6 changes: 4 additions & 2 deletions cmake/catkin_python_setup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,13 @@ function(catkin_python_setup)
@ONLY)

add_python_executable(SCRIPT_NAME ${name}
TARGET_NAME ${name}_executable_devel
# prefix with project name to avoid collisions across packages
TARGET_NAME ${PROJECT_NAME}_${name}_exec_devel
DESTINATION ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION})

add_python_executable(SCRIPT_NAME ${name}
TARGET_NAME ${name}_executable_install
# prefix with project name to avoid collisions across packages
TARGET_NAME ${PROJECT_NAME}_${name}_exec_install
DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
endforeach()
endfunction()
Expand Down