Skip to content

Commit

Permalink
eclass/ros-catkin.eclass: Set PYTHON_INSTALL_DIR when building python…
Browse files Browse the repository at this point in the history
… packages.
  • Loading branch information
aballier committed Feb 9, 2017
1 parent 008d1bf commit 902cc55
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion eclass/ros-catkin.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ ros-catkin_src_prepare() {
# Internal decoration of cmake-utils_src_configure to handle multiple python installs.
ros-catkin_src_configure_internal() {
if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then
local mycmakeargs=("${mycmakeargs[@]}" -DPYTHON_EXECUTABLE="${PYTHON}")
local sitedir="$(python_get_sitedir)"
local mycmakeargs=(
"${mycmakeargs[@]}"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
)
python_export PYTHON_SCRIPTDIR
fi
cmake-utils_src_configure "${@}"
Expand Down

0 comments on commit 902cc55

Please sign in to comment.