diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-16 15:40:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-16 15:40:29 (GMT) |
| commit | 516c0736e8cc5f57f8c85c182b14040bfe590e5d (patch) | |
| tree | 9c9470c94e4761b84fb3cffcf7f3f59fef3a3f1d | |
| parent | 7f2203ab4ad131e831b0574bb79a0ccb65126b14 (diff) | |
| parent | 4642c81c724f23eb634d31fed989fce98cc724ff (diff) | |
| download | CMake-516c0736e8cc5f57f8c85c182b14040bfe590e5d.zip CMake-516c0736e8cc5f57f8c85c182b14040bfe590e5d.tar.gz CMake-516c0736e8cc5f57f8c85c182b14040bfe590e5d.tar.bz2 | |
Merge topic 'IntelLLVM-unused-C17' into release-3.20
4642c81c72 IntelLLVM: Remove incomplete C17 support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5805
| -rw-r--r-- | Modules/Compiler/IntelLLVM-C.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Modules/Compiler/IntelLLVM-C.cmake b/Modules/Compiler/IntelLLVM-C.cmake index 0ad2f0d..fce2971 100644 --- a/Modules/Compiler/IntelLLVM-C.cmake +++ b/Modules/Compiler/IntelLLVM-C.cmake @@ -27,7 +27,6 @@ endif() set(CMAKE_C90_STANDARD__HAS_FULL_SUPPORT ON) set(CMAKE_C99_STANDARD__HAS_FULL_SUPPORT ON) set(CMAKE_C11_STANDARD__HAS_FULL_SUPPORT ON) -set(CMAKE_C17_STANDARD__HAS_FULL_SUPPORT ON) if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") @@ -38,9 +37,6 @@ if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11") set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11") - - set(CMAKE_C17_STANDARD_COMPILE_OPTION "-std=c17") - set(CMAKE_C17_EXTENSION_COMPILE_OPTION "-std=gnu17") else() # clang-cl doesn't have any of these set(CMAKE_C90_STANDARD_COMPILE_OPTION "") @@ -51,13 +47,12 @@ else() set(CMAKE_C11_STANDARD_COMPILE_OPTION "") set(CMAKE_C11_EXTENSION_COMPILE_OPTION "") - - set(CMAKE_C17_STANDARD_COMPILE_OPTION "") - set(CMAKE_C17_EXTENSION_COMPILE_OPTION "") endif() if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") - __compiler_check_default_language_standard(C 2020 17) + # FIXME: The compiler actually defaults to C17, but + # CMake does not yet model or detect that standard. + __compiler_check_default_language_standard(C 2020 11) else() set(CMAKE_C_STANDARD_DEFAULT "") endif() |