From 27db7274288d6203d67257400d0fa253f40bd0cb Mon Sep 17 00:00:00 2001 From: Daniel Stonier Date: Tue, 5 Mar 2013 18:00:54 +0900 Subject: [PATCH] source setup prior to calling catkin_make --- .../src/yujin_tools/templates/init_build/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 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 index 3044881..779275c 100644 --- 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: