Modernize: require cmake version 3.1.3

This commit is contained in:
Robert Haschke 2020-12-03 23:39:41 +01:00
parent 5d4cf640ef
commit bc25c5e3c1
6 changed files with 9 additions and 22 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.1.3)
project(moveit_task_constructor_capabilities)
add_compile_options(-std=c++14)

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.1.3)
project(moveit_task_constructor_core)
find_package(Boost REQUIRED)
@ -27,16 +27,11 @@ catkin_package(
visualization_msgs
)
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
add_compile_options(-std=c++14)
else ()
set(CMAKE_CXX_STANDARD 14)
endif ()
set(CMAKE_CXX_STANDARD 14)
# check for MOVEIT_MASTER
include(CheckIncludeFileCXX)
set(CMAKE_REQUIRED_INCLUDES ${moveit_core_INCLUDE_DIRS})
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
CHECK_INCLUDE_FILE_CXX(moveit/collision_detection/collision_env.h MOVEIT_MASTER)
if(NOT MOVEIT_MASTER)
set(MOVEIT_MASTER 0)

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.1.3)
project(moveit_task_constructor_demo)
add_compile_options(-std=c++14)

View File

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

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.1.3)
project(rviz_marker_tools)
find_package(catkin REQUIRED COMPONENTS
@ -20,11 +20,7 @@ catkin_package(
rviz
)
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
add_compile_options(-std=c++14)
else ()
set(CMAKE_CXX_STANDARD 14)
endif ()
set(CMAKE_CXX_STANDARD 14)
set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME})

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.1.3)
project(moveit_task_constructor_visualization)
find_package(catkin REQUIRED COMPONENTS
@ -46,11 +46,7 @@ catkin_package(
rviz
)
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
add_compile_options(-std=c++14)
else ()
set(CMAKE_CXX_STANDARD 14)
endif ()
set(CMAKE_CXX_STANDARD 14)
add_subdirectory(visualization_tools)
add_subdirectory(motion_planning_tasks)