Permalink
Browse files

Add environment PYTHONPATH, #123.

  • Loading branch information...
1 parent 1e45c25 commit 19b316c81515c67f37ef7da6e17434ebde97d590 Brian Gerkey committed Apr 24, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 cmake/templates/python_distutils_install.sh.in
View
5 cmake/templates/python_distutils_install.sh.in
@@ -17,8 +17,11 @@ fi
cd @INSTALL_CMD_WORKING_DIRECTORY@
# todo --install-layout=deb per platform
+# Note that PYTHONPATH is pulled from the environment to support installing
+# into one location when some dependencies were installed in another
+# location, #123.
/usr/bin/env \
- PYTHONPATH=@INSTALLED_PYTHONPATH@:@CMAKE_BINARY_DIR@/gen/py \
+ PYTHONPATH=@INSTALLED_PYTHONPATH@:@CMAKE_BINARY_DIR@/gen/py:$PYTHONPATH \
CATKIN_BINARY_DIR=@CMAKE_BINARY_DIR@ \
@PYTHON_EXECUTABLE@ \
@CMAKE_CURRENT_SOURCE_DIR@/setup.py \

0 comments on commit 19b316c

Please sign in to comment.