From 863604bf3595c60f70980d43cc84d57b5123bab0 Mon Sep 17 00:00:00 2001
From: Ladislas de Toldi <ladislas@detoldi.me>
Date: Thu, 4 Mar 2021 23:04:13 +0100
Subject: [PATCH] :triangular_flag_on_post: (cmake): Upgrade std flag to
 --std=c++17

---
 .vscode/c_cpp_properties.json |  2 +-
 CMakeLists.txt                | 14 +++++++++++++-
 mbed-cmake.cmake              |  9 ---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 383dc26ac9..886c3978aa 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -9,7 +9,7 @@
 			"macFrameworkPath": [],
 			"compilerPath": "/usr/local/bin/arm-none-eabi-gcc",
 			"cStandard": "gnu11",
-			"cppStandard": "gnu++14",
+			"cppStandard": "gnu++17",
 			"intelliSenseMode": "gcc-arm",
 			"compilerArgs": [],
 			"configurationProvider": "ms-vscode.cmake-tools",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dd28b65bd..bf724f92b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ if(ENABLE_CODE_ANALYSIS)
 	if(CPPCHECK)
 		set(CMAKE_CXX_CPPCHECK "${CPPCHECK}"
 			"--platform=${CMAKE_CURRENT_SOURCE_DIR}/tools/config/cppcheck_leka_platform.xml"
-			"--std=c++14"
+			"--std=c++17"
 			"--cppcheck-build-dir=build/cppcheck"
 			"--enable=all"
 			"--inconclusive"
@@ -35,6 +35,18 @@ if(ENABLE_CODE_ANALYSIS)
 	endif(CPPCHECK)
 endif(ENABLE_CODE_ANALYSIS)
 
+# Set C/C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_EXTENSIONS TRUE)
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_EXTENSIONS TRUE)
+
+# Add custom flags
+add_compile_options(
+	-fdiagnostics-color
+	$<$<COMPILE_LANGUAGE:CXX>:-Wno-register>
+)
+
 # Before all, set ROOT_DIR, MBED_OS_DIR
 set(ROOT_DIR    ${CMAKE_CURRENT_LIST_DIR})
 set(MBED_OS_DIR ${ROOT_DIR}/extern/mbed-os)
diff --git a/mbed-cmake.cmake b/mbed-cmake.cmake
index 264fb57aec..05d27a735e 100644
--- a/mbed-cmake.cmake
+++ b/mbed-cmake.cmake
@@ -25,9 +25,6 @@ list(APPEND CMAKE_MODULE_PATH ${MBED_CMAKE_ROOT_DIR}/utils)
 # Fix error: The C Compiler is not able to compile a simple test program
 set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 
-# Add custom flags
-add_compile_options(-fdiagnostics-color)
-
 include(CheckTypeSize)
 include(Shorthand)
 include(Utils)
@@ -104,12 +101,6 @@ if(NOT MBED_UNITTESTS)
 	endforeach()
 endif()
 
-# Set language standard
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_EXTENSIONS TRUE)
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_C_EXTENSIONS TRUE)
-
 # find python (used for memap and several upload methods)
 # -------------------------------------------------------------