[ros] 05/05: Sat ROS_ROOT for rosmake if it's not set

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch patch-queue/master
in repository ros.

commit aede16e429cea4486a175b86d26db49ae099ec51
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Sep 1 08:37:52 2015 +0200

    Sat ROS_ROOT for rosmake if it's not set
    
    
    Gbp-Pq: Name 0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
---
 core/mk/cmake.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/mk/cmake.mk b/core/mk/cmake.mk
index e74b690..476fb4f 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)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros.git