Skip to content

Commit f6308f4

Browse files
rhaschkerhaschke
committedFeb 5, 2020
Fixup: Use CMAKE_CXX_STANDARD to enforce c++14 for portability (moveit#1607)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1 parent dc70886 commit f6308f4

File tree

28 files changed

+31
-8
lines changed

28 files changed

+31
-8
lines changed
 

‎moveit/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

‎moveit_core/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_core)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
# Warnings

‎moveit_experimental/moveit_jog_arm/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_jog_arm)
33

44
set(CMAKE_CXX_STANDARD 14)

‎moveit_kinematics/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_kinematics)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_kinematics/ikfast_kinematics_plugin/templates/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(_PACKAGE_NAME_)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
find_package(catkin REQUIRED COMPONENTS

‎moveit_planners/chomp/chomp_interface/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_planners_chomp)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
# find catkin in isolation so that CATKIN_ENABLE_TESTING is defined

‎moveit_planners/chomp/chomp_motion_planner/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(chomp_motion_planner)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
find_package(catkin REQUIRED COMPONENTS

‎moveit_planners/chomp/chomp_optimizer_adapter/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_chomp_optimizer_adapter)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
find_package(catkin REQUIRED COMPONENTS

‎moveit_planners/moveit_planners/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_planners)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

‎moveit_planners/ompl/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ project(moveit_planners_ompl)
33

44
# At least C++11 required for OMPL
55
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
67
set(CMAKE_CXX_EXTENSIONS OFF)
78

89
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_planners/trajopt/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_planners_trajopt)
33

4-
add_compile_options(-std=c++14)
4+
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6+
set(CMAKE_CXX_EXTENSIONS OFF)
57

68
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
79
set(CMAKE_BUILD_TYPE Release)

‎moveit_plugins/moveit_fake_controller_manager/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_fake_controller_manager)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_plugins/moveit_plugins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_plugins)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

‎moveit_plugins/moveit_ros_control_interface/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_control_interface)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
find_package(catkin REQUIRED COMPONENTS

‎moveit_plugins/moveit_simple_controller_manager/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_simple_controller_manager)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/benchmarks/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ project(moveit_ros_benchmarks)
44
set(MOVEIT_LIB_NAME moveit_ros_benchmarks)
55

66
set(CMAKE_CXX_STANDARD 14)
7+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
78
set(CMAKE_CXX_EXTENSIONS OFF)
89

910
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/manipulation/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_manipulation)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/move_group/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_move_group)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/moveit_ros/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

‎moveit_ros/occupancy_map_monitor/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ project(moveit_ros_occupancy_map_monitor)
33
set(MOVEIT_LIB_NAME ${PROJECT_NAME})
44

55
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
67
set(CMAKE_CXX_EXTENSIONS OFF)
78

89
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/perception/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_perception)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
option(WITH_OPENGL "Build the parts that depend on OpenGL" ON)

‎moveit_ros/planning/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_planning)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/planning_interface/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_planning_interface)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/robot_interaction/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_robot_interaction)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_ros/visualization/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_visualization)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

‎moveit_ros/warehouse/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_ros_warehouse)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

‎moveit_runtime/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_runtime)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

‎moveit_setup_assistant/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1.3)
22
project(moveit_setup_assistant)
33

44
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

0 commit comments

Comments
 (0)