diff --git a/capabilities/CMakeLists.txt b/capabilities/CMakeLists.txt index f0c673ab..47b9a314 100644 --- a/capabilities/CMakeLists.txt +++ b/capabilities/CMakeLists.txt @@ -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) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index f3f2e1f8..7032b57d 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -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) diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index 9ac220ca..7eb7d1e2 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -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) diff --git a/msgs/CMakeLists.txt b/msgs/CMakeLists.txt index 0dda0653..b72f0787 100644 --- a/msgs/CMakeLists.txt +++ b/msgs/CMakeLists.txt @@ -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) diff --git a/rviz_marker_tools/CMakeLists.txt b/rviz_marker_tools/CMakeLists.txt index 060421fb..d7afda22 100644 --- a/rviz_marker_tools/CMakeLists.txt +++ b/rviz_marker_tools/CMakeLists.txt @@ -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}) diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt index ea2cbf58..5d23d982 100644 --- a/visualization/CMakeLists.txt +++ b/visualization/CMakeLists.txt @@ -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)