From adc655bd63cd40232c9e77877e1bbf37b99c6f2e Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Thu, 14 Mar 2024 07:25:25 +0000 Subject: [PATCH] [cmake] Set language and standard. It is 2024 and all compilers should have implemented 17 by now --- CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91db46e1..2b4f7e84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,13 @@ cmake_minimum_required(VERSION 3.4.3) project(xeus-cpp) + +enable_language(CXX) +set(CMAKE_CXX_EXTENSIONS NO) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}") set(XEUS_CPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -107,14 +114,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" if(NOT EMSCRIPTEN) add_compile_options(-Wunused-parameter -Wextra -Wreorder) endif() - - - CHECK_CXX_COMPILER_FLAG("-std=c++17" HAS_CPP_17_FLAG) - if (HAS_CPP_17_FLAG) - add_compile_options(-std=c++17) - else () - message(FATAL_ERROR "Unsupported compiler -- xeus requires C++17 support!") - endif () endif () if(EMSCRIPTEN)