From 881f70377ffd03b73b8f8c0d19958a0948b860f4 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Mon, 9 May 2016 13:45:49 -0400 Subject: [PATCH] Added CATKIN_ENABLE_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 2d114c47..0bfdc0cb 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 OR CATKIN_SKIP_TESTING) +IF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING OR CATKIN_ENABLE_TESTING) SET(CATKIN_BUILD TRUE) -ENDIF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING) +ENDIF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING OR CATKIN_ENABLE_TESTING) MESSAGE(STATUS "CATKIN_BUILD=${CATKIN_BUILD}")