From 69bf2f6139b533d47eb80c62c29fbdcf399a9479 Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Fri, 22 Jul 2011 12:20:37 +0000 Subject: [PATCH] added WITH_ROS patch to default CMakeLists --- CMakeLists.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56e9291b..fd9eebc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT( OctoMap ) +PROJECT( octomap ) # version (e.g. for packaging) set(OCTOMAP_MAJOR_VERSION 1) @@ -14,6 +14,17 @@ endif(COMMAND cmake_policy) # COMPILER SETTINGS (default: Release) and flags INCLUDE(CMakeModules/CompilerSettings.cmake) +#If we are compiling with ROS support, we need to get the appropriate includes and link flags and such +if(WITH_ROS) + include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) + set(ROSBUILD_DONT_REDEFINE_PROJECT true) + set(PROJECT_SOURCE_DIR_BACKUP ${PROJECT_SOURCE_DIR}) + set(PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../..") + rosbuild_init() + set(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR_BACKUP}) + add_definitions(-DOCTOMAP_ROS) +endif(WITH_ROS) + # Set output directories for libraries and executables SET( BASE_DIR ${CMAKE_SOURCE_DIR} ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BASE_DIR}/lib )