Skip to content

Commit bc25c5e

Browse files
committed
Modernize: require cmake version 3.1.3
1 parent 5d4cf64 commit bc25c5e

6 files changed

Lines changed: 9 additions & 22 deletions

File tree

capabilities/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_task_constructor_capabilities)
33

44
add_compile_options(-std=c++14)

core/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_task_constructor_core)
33

44
find_package(Boost REQUIRED)
@@ -27,16 +27,11 @@ catkin_package(
2727
visualization_msgs
2828
)
2929

30-
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
31-
add_compile_options(-std=c++14)
32-
else ()
33-
set(CMAKE_CXX_STANDARD 14)
34-
endif ()
30+
set(CMAKE_CXX_STANDARD 14)
3531

3632
# check for MOVEIT_MASTER
3733
include(CheckIncludeFileCXX)
3834
set(CMAKE_REQUIRED_INCLUDES ${moveit_core_INCLUDE_DIRS})
39-
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
4035
CHECK_INCLUDE_FILE_CXX(moveit/collision_detection/collision_env.h MOVEIT_MASTER)
4136
if(NOT MOVEIT_MASTER)
4237
set(MOVEIT_MASTER 0)

demo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_task_constructor_demo)
33

44
add_compile_options(-std=c++14)

msgs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_task_constructor_msgs)
33

44
set(MSG_DEPS moveit_msgs visualization_msgs)

rviz_marker_tools/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(rviz_marker_tools)
33

44
find_package(catkin REQUIRED COMPONENTS
@@ -20,11 +20,7 @@ catkin_package(
2020
rviz
2121
)
2222

23-
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
24-
add_compile_options(-std=c++14)
25-
else ()
26-
set(CMAKE_CXX_STANDARD 14)
27-
endif ()
23+
set(CMAKE_CXX_STANDARD 14)
2824

2925
set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME})
3026

visualization/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_task_constructor_visualization)
33

44
find_package(catkin REQUIRED COMPONENTS
@@ -46,11 +46,7 @@ catkin_package(
4646
rviz
4747
)
4848

49-
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
50-
add_compile_options(-std=c++14)
51-
else ()
52-
set(CMAKE_CXX_STANDARD 14)
53-
endif ()
49+
set(CMAKE_CXX_STANDARD 14)
5450

5551
add_subdirectory(visualization_tools)
5652
add_subdirectory(motion_planning_tasks)

0 commit comments

Comments
 (0)