Help find catkin python for install underlays

This is a follow on from ros#397
stonier · Apr 8, 2013 · 0ea7bc8 · 0ea7bc8
1 parent 5e89a61
commit 0ea7bc8
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cmake/templates/generate_cached_setup.py.in b/cmake/templates/generate_cached_setup.py.in
@@ -7,6 +7,8 @@ import sys
 # find the import relatively if available to work before installing catkin or overlaying installed version
 if os.path.exists(os.path.join('@catkin_EXTRAS_DIR@', 'catkinConfig.cmake.in')):
     sys.path.insert(0, os.path.join('@catkin_EXTRAS_DIR@', '..', 'python'))
+for workspace in reversed("@CATKIN_WORKSPACES@".split(';')):
+    sys.path.insert(0, os.path.join(workspace, '@CATKIN_GLOBAL_PYTHON_DESTINATION@'))
 from catkin.environment_cache import generate_environment_script
 
 code = generate_environment_script('@CATKIN_DEVEL_PREFIX@/env.@script_ext@')