mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 13:20:47 -06:00
Merge topic 'tasking-std-flags'
c0972d2c81 Tasking: Drop extensions from C and CXX standard level flags
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Josef Angstenberger <code@jtxa.de>
Merge-request: !10208
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user