cmake compatbility to 2.8.12

This commit is contained in:
Robert Haschke 2017-11-24 13:37:50 +01:00
parent 81b1281c02
commit b48ba91a75
3 changed files with 14 additions and 5 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 2.8.12)
project(moveit_task_constructor_core)
find_package(catkin REQUIRED COMPONENTS
@ -18,7 +18,12 @@ catkin_package(
include
)
set(CMAKE_CXX_STANDARD 14)
if (CMAKE_VERSION VERSION_LESS "3.1")
add_compile_options(-std=c++14)
else ()
set(CMAKE_CXX_STANDARD 14)
endif ()
set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/moveit/task_constructor)
include_directories(${catkin_INCLUDE_DIRS})

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.12)
cmake_minimum_required(VERSION 2.8.12)
project(moveit_task_constructor_msgs)
set(MSG_DEPS moveit_msgs visualization_msgs)

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 2.8.12)
project(moveit_task_constructor_visualization)
find_package(catkin REQUIRED COMPONENTS
@ -33,7 +33,11 @@ add_definitions(-DQT_NO_KEYWORDS)
catkin_package(
)
set(CMAKE_CXX_STANDARD 14)
if (CMAKE_VERSION VERSION_LESS "3.1")
add_compile_options(-std=c++14)
else ()
set(CMAKE_CXX_STANDARD 14)
endif ()
include_directories(${catkin_INCLUDE_DIRS})