From c0972d2c810962dbe4bd5589327f591686898fa5 Mon Sep 17 00:00:00 2001 From: Alaa Mahran Date: Tue, 21 Jan 2025 14:54:21 +0100 Subject: [PATCH] Tasking: Drop extensions from C and CXX standard level flags Tasking compiler extensions and language standard flags are not tied together as they are with gcc/clang. Since CMake does not model granular abstractions for extensions, leave individual extension flags to the project or user. Fixes: #26591 --- Modules/Compiler/Tasking-C.cmake | 10 +++++----- Modules/Compiler/Tasking-CXX.cmake | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Modules/Compiler/Tasking-C.cmake b/Modules/Compiler/Tasking-C.cmake index 86b53981a0..d0ed386a07 100644 --- a/Modules/Compiler/Tasking-C.cmake +++ b/Modules/Compiler/Tasking-C.cmake @@ -1,14 +1,14 @@ include(Compiler/Tasking) __compiler_tasking(C) +# Extension flags are not tied to the standard level flags. +# Avoid passing them here so users/projects can control them independently. set(CMAKE_C90_STANDARD_COMPILE_OPTION "--iso=90") -set(CMAKE_C90_EXTENSION_COMPILE_OPTION "--iso=90" "--language=+gcc,+kanji,+comments,+volatile,+strings") - +set(CMAKE_C90_EXTENSION_COMPILE_OPTION "--iso=90") set(CMAKE_C99_STANDARD_COMPILE_OPTION "--iso=99") -set(CMAKE_C99_EXTENSION_COMPILE_OPTION "--iso=99" "--language=+gcc,+kanji,+volatile,+strings") - +set(CMAKE_C99_EXTENSION_COMPILE_OPTION "--iso=99") set(CMAKE_C11_STANDARD_COMPILE_OPTION "--iso=11") -set(CMAKE_C11_EXTENSION_COMPILE_OPTION "--iso=11" "--language=+gcc,+kanji,+volatile,+strings") +set(CMAKE_C11_EXTENSION_COMPILE_OPTION "--iso=11") set(CMAKE_C_STANDARD_LATEST 11) diff --git a/Modules/Compiler/Tasking-CXX.cmake b/Modules/Compiler/Tasking-CXX.cmake index 1aa840abc7..53ae3ed00f 100644 --- a/Modules/Compiler/Tasking-CXX.cmake +++ b/Modules/Compiler/Tasking-CXX.cmake @@ -3,13 +3,13 @@ include(Compiler/Tasking) __compiler_tasking(CXX) -set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "--c++=03" "--strict") +# Extension flags are not tied to the standard level flags. +# Avoid passing them here so users/projects can control them independently. +set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "--c++=03") set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "--c++=03") - -set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "--c++=11" "--strict") +set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "--c++=11") set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "--c++=11") - -set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "--c++=14" "--strict") +set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "--c++=14") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "--c++=14") set(CMAKE_CXX_STANDARD_LATEST 14)