1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Tue, 17 Nov 2015 00:01:41 +0100
Subject: Add default ROS_ROOT to rosmake
---
tools/rosmake/src/rosmake/engine.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/rosmake/src/rosmake/engine.py b/tools/rosmake/src/rosmake/engine.py
index 3fee753..0be1862 100644
--- a/tools/rosmake/src/rosmake/engine.py
+++ b/tools/rosmake/src/rosmake/engine.py
@@ -385,6 +385,8 @@ class RosMakeAll:
with _popen_lock:
num_cpus = parallel_build.num_cpus()
local_env['ROS_PARALLEL_JOBS'] = '-j%d -l%d' % (num_cpus, num_cpus)
+ if 'ROS_ROOT' not in os.environ:
+ local_env['ROS_ROOT'] = '/usr/share/ros'
local_env['SVN_CMDLINE'] = 'svn --non-interactive'
cmd = ['bash', '-c', 'cd %s && %s ' % (self.rospack.get_path(package), make_command())] # UNIXONLY
if argument:
|
