source setup prior to calling catkin_make

yujinrobot · Mar 5, 2013 · 27db727 · 27db727
1 parent c3f6a25
commit 27db727
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pip/yujin_tools/src/yujin_tools/templates/init_build/Makefile b/pip/yujin_tools/src/yujin_tools/templates/init_build/Makefile
@@ -60,11 +60,13 @@ ccmake:
 
 # Note that this defaults to ROS_PARALLEL_JOBS and falls back to no. of cores for parallelisation	
 build: 
-	catkin_make --directory=${WORKSPACE} --source=${SOURCE} --build=${BUILD} ${BUILD_TYPE} ${UNDERLAYS} ${TOOLCHAIN} ${PLATFORM} ${INSTALL} ${BLACKLIST}; \
+	. /opt/ros/groovy/setup.sh; \
+	catkin_make --directory=${WORKSPACE} --source=${SOURCE} --build=${BUILD} ${BUILD_TYPE} ${UNDERLAYS} ${TOOLCHAIN} ${PLATFORM} ${INSTALL} ${BLACKLIST}
 
 # Note that this defaults to ROS_PARALLEL_JOBS and falls back to no. of cores for parallelisation	
 rebuild: 
-	catkin_make --force-cmake --directory=${WORKSPACE} --source=${SOURCE} --build=${BUILD} ${BUILD_TYPE} ${UNDERLAYS} ${TOOLCHAIN} ${PLATFORM} ${INSTALL} ${BLACKLIST}; \
+	. /opt/ros/groovy/setup.sh; \
+	catkin_make --force-cmake --directory=${WORKSPACE} --source=${SOURCE} --build=${BUILD} ${BUILD_TYPE} ${UNDERLAYS} ${TOOLCHAIN} ${PLATFORM} ${INSTALL} ${BLACKLIST}
 
 # No parallelisation for this
 install: