From a5c25df708b1750530e573fa3a08436146bb9fcd Mon Sep 17 00:00:00 2001 From: matlabbe Date: Mon, 9 May 2016 12:34:41 -0400 Subject: [PATCH] Added CATKIN_SKIP_TESTING to detect catkin on dev build on ROS buildfarm --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdd4186a..2d114c47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.5) # Detect if it is called by catkin -IF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE) +IF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING) SET(CATKIN_BUILD TRUE) -ENDIF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE) +ENDIF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING) MESSAGE(STATUS "CATKIN_BUILD=${CATKIN_BUILD}")