From 19b316c81515c67f37ef7da6e17434ebde97d590 Mon Sep 17 00:00:00 2001 From: Brian Gerkey Date: Tue, 24 Apr 2012 12:27:58 -0700 Subject: [PATCH] Add environment PYTHONPATH, #123. --- cmake/templates/python_distutils_install.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/templates/python_distutils_install.sh.in b/cmake/templates/python_distutils_install.sh.in index ea8c67986..d458c753c 100755 --- a/cmake/templates/python_distutils_install.sh.in +++ b/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 \