Skip to content

Commit

Permalink
Preserve symlinks during copy (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbovbel committed May 27, 2020
1 parent 1139dc3 commit fc4379c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,13 @@ function(catkin_generate_virtualenv)

add_custom_command(COMMENT "Prepare relocated virtualenvs for develspace and installspace"
OUTPUT ${venv_devel_dir} install/${venv_dir}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${venv_dir} ${venv_devel_dir}
# CMake copy_directory doesn't preserve symlinks https://gitlab.kitware.com/cmake/cmake/issues/14609
# COMMAND ${CMAKE_COMMAND} -E copy_directory ${venv_dir} ${venv_devel_dir}
# COMMAND ${CMAKE_COMMAND} -E copy_directory ${venv_dir} install/${venv_dir}
COMMAND mkdir -p ${venv_devel_dir} && cp -r ${venv_dir}/* ${venv_devel_dir}
COMMAND mkdir -p install/${venv_dir} && cp -r ${venv_dir}/* install/${venv_dir}

COMMAND ${CATKIN_ENV} rosrun catkin_virtualenv venv_relocate ${venv_devel_dir} --target-dir ${venv_devel_dir}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${venv_dir} install/${venv_dir}
COMMAND ${CATKIN_ENV} rosrun catkin_virtualenv venv_relocate install/${venv_dir} --target-dir ${venv_install_dir}
DEPENDS ${CMAKE_BINARY_DIR}/${venv_dir}/bin/activate
)
Expand Down

0 comments on commit fc4379c

Please sign in to comment.