Skip to content

Commit b5d254a

Browse files
committed
Setting C++ standard to 17
1 parent f1f8a46 commit b5d254a

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

yasmin/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(yasmin)
33

4-
# Default to C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
4+
# Set C++ standard to 17
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
87

98
# Find dependencies
109
find_package(ament_cmake REQUIRED)

yasmin_demos/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(yasmin_demos)
33

4-
# Default to C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
4+
# Set C++ standard to 17
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
87

98
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
109
add_compile_options(-Wall -Wextra -Wpedantic)

yasmin_editor/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(yasmin_editor)
33

4+
# Set C++ standard to 17
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
48
# Find dependencies
59
find_package(ament_cmake REQUIRED)
610
find_package(ament_cmake_python REQUIRED)

yasmin_factory/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
cmake_minimum_required(VERSION 3.16)
22
project(yasmin_factory)
33

4+
# Set C++ standard to 17
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
48
find_package(ament_cmake REQUIRED)
59
find_package(ament_cmake_python REQUIRED)
610
find_package(rclcpp REQUIRED)
@@ -11,8 +15,6 @@ find_package(pybind11 REQUIRED)
1115
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
1216
find_package(TinyXML2 REQUIRED)
1317

14-
set(CMAKE_CXX_STANDARD 17)
15-
1618
# Build C++ yasmin_factory library
1719
add_library(${PROJECT_NAME} SHARED
1820
src/yasmin_factory.cpp

yasmin_ros/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(yasmin_ros)
33

4-
# Default to C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
4+
# Set C++ standard to 17
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
87

98
# Find dependencies
109
find_package(ament_cmake REQUIRED)
@@ -68,7 +67,6 @@ ament_export_libraries(${PROJECT_NAME})
6867
ament_export_targets(${PROJECT_NAME})
6968
ament_export_dependencies(${DEPENDENCIES_PACKAGE})
7069

71-
7270
# Python
7371
ament_python_install_package(${PROJECT_NAME})
7472

yasmin_viewer/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(yasmin_viewer)
33

4-
# Default to C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
4+
# Set C++ standard to 17
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
87

98
# Find dependencies
109
find_package(ament_cmake REQUIRED)

0 commit comments

Comments
 (0)