blob: e667ea9cf59ee6652e5d6a9b0fbbcec91fd6e450 [file] [log] [blame]
Author: Eric Timmons
https://bugs.gentoo.org/show_bug.cgi?id=586104
Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
===================================================================
--- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in
+++ catkin-0.6.16/cmake/templates/_setup_util.py.in
@@ -262,7 +262,7 @@
sys.exit(1)
# environment at generation time
- CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+ CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
# prepend current workspace if not already part of CPP
base_path = os.path.dirname(__file__)
if base_path not in CMAKE_PREFIX_PATH:
Index: catkin-0.7.1/python/catkin/builder.py
===================================================================
--- catkin-0.7.1.orig/python/catkin/builder.py
+++ catkin-0.7.1/python/catkin/builder.py
@@ -1026,6 +1026,7 @@ def build_workspace_isolated(
'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
'PYTHON_EXECUTABLE': sys.executable,
'PYTHON_INSTALL_DIR': get_python_install_dir(),
}
Index: catkin-0.7.1/test/unit_tests/test_setup_util.py
===================================================================
--- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py
+++ catkin-0.7.1/test/unit_tests/test_setup_util.py
@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
'PYTHON_EXECUTABLE': sys.executable,
'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
'CMAKE_PREFIX_PATH_AS_IS': '',
+ 'CATKIN_PREFIX_PATH':'',
})
with tempfile.NamedTemporaryFile('w+') as setup_util_file:
setup_util_file.write(data)