From c05b208cde36e8b9ab09abf48682c02c117a2b6e Mon Sep 17 00:00:00 2001 From: matlabbe Date: Wed, 20 May 2015 16:55:56 -0400 Subject: [PATCH] Added auto detection of catkin --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3afe14d..19c1539c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,13 @@ cmake_minimum_required(VERSION 2.8.3) -OPTION(CATKIN_BUILD "Set to ON to build in a Catkin workspace (ROS)" OFF) +# Detect if it is called by catkin +SET(CATKIN_BUILD ${CATKIN_TOPLEVEL}) IF(NOT CATKIN_BUILD) #Standalone build PROJECT( Find-Object ) ELSE() - #Standalone build + #ROS catkin build PROJECT( find_object_2d ) ENDIF()