summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-03 13:16:49 (GMT)
committerBrad King <brad.king@kitware.com>2016-08-03 13:16:49 (GMT)
commit236050153cea703e120e8b616ba785772a01819d (patch)
tree3eceff4de480636156378c132a1b2cefd5ea18eb
parent88f4b4c9e03fae6cda2160b5f96b23ce42ce0b78 (diff)
parent088f14eb725650158d256c28e86e44da3989ad9c (diff)
downloadCMake-236050153cea703e120e8b616ba785772a01819d.zip
CMake-236050153cea703e120e8b616ba785772a01819d.tar.gz
CMake-236050153cea703e120e8b616ba785772a01819d.tar.bz2
Merge branch 'intel-gnu11-support' into release
-rw-r--r--Modules/Compiler/Intel-C.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index eb9602a..edca154 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -16,14 +16,14 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
- set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
+ set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11")
endif()
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
- set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=c89")
+ set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
- set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=c99")
+ set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)