From 46805e26662c11e5c5423a1f714a945b78259cb1 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Fri, 17 Jan 2020 12:03:12 +0100 Subject: [PATCH] Fixup: avoid deprecation warnings of MoveIt master branch Fixes missing definition of MOVEIT_MASTER for capabilities packages in 233d63aa7aa3f06b687442b8fe8ece695d41132f --- capabilities/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/capabilities/CMakeLists.txt b/capabilities/CMakeLists.txt index df46f9ff..47744cd4 100644 --- a/capabilities/CMakeLists.txt +++ b/capabilities/CMakeLists.txt @@ -19,6 +19,15 @@ catkin_package( std_msgs ) +# check for MOVEIT_MASTER +include(CheckIncludeFileCXX) +set(CMAKE_REQUIRED_INCLUDES ${moveit_core_INCLUDE_DIRS}) +CHECK_INCLUDE_FILE_CXX(moveit/collision_detection/collision_env.h MOVEIT_MASTER) +if(NOT MOVEIT_MASTER) + set(MOVEIT_MASTER 0) +endif() +add_definitions(-DMOVEIT_MASTER=${MOVEIT_MASTER}) + include_directories( ${catkin_INCLUDE_DIRS} )