From 41fb0ff5d6c4602b15d012afdc1c02a54509192f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 7 Dec 2025 14:57:41 +0900 Subject: Use a better way to enforced the minimum C++ standard required and extend the check also to modules that do not make use of TQt (for example libr or akode) Signed-off-by: Michele Calgaro --- modules/FindTQt.cmake | 3 --- modules/TDEMacros.cmake | 7 +++++++ modules/TDEVersion.cmake | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake index e377a99..87fd496 100644 --- a/modules/FindTQt.cmake +++ b/modules/FindTQt.cmake @@ -52,6 +52,3 @@ endif( NOT TQT_FOUND ) # Set compiler flags according to build type set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG" ) set( CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG" ) - -# Set the required minimum C++ standard -set( TDE_CXX_FEATURES cxx_nullptr ) diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake index c7f6609..4b1581b 100644 --- a/modules/TDEMacros.cmake +++ b/modules/TDEMacros.cmake @@ -2923,6 +2923,13 @@ macro( tde_setup_architecture_flags ) endif() endforeach() endif( ) + + # Set minimum required ISO C++ standard and forces + # failure in case the compiler doesn't support it + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + endmacro( ) diff --git a/modules/TDEVersion.cmake b/modules/TDEVersion.cmake index 48589de..9aa5121 100644 --- a/modules/TDEVersion.cmake +++ b/modules/TDEVersion.cmake @@ -34,4 +34,3 @@ macro( tde_set_project_version ) endif() endmacro( ) - -- cgit v1.2.3