1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Tue, 1 Sep 2015 08:37:52 +0200
Subject: Sat ROS_ROOT for rosmake if it's not set
---
core/mk/cmake.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/mk/cmake.mk b/core/mk/cmake.mk
index c0f8f80..923466b 100644
--- a/core/mk/cmake.mk
+++ b/core/mk/cmake.mk
@@ -1,3 +1,7 @@
+ifeq ($(ROS_ROOT),)
+ export ROS_ROOT=/usr/share/ros
+endif
+
# set EXTRA_CMAKE_FLAGS in the including Makefile in order to add tweaks
CMAKE_FLAGS= -Wdev -DCMAKE_TOOLCHAIN_FILE=$(ROS_ROOT)/core/rosbuild/rostoolchain.cmake $(EXTRA_CMAKE_FLAGS)
|
