diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-01 14:16:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-01 14:16:22 (GMT) |
| commit | 2dfe480a9c3fe40699ad85aa0355111848df870b (patch) | |
| tree | 41b4d4d0fabecc09432268fb04492d656575d24b /Modules | |
| parent | d88ab13750860e0f7f71e10fe21a15194214d07e (diff) | |
| parent | 5d70894d4086b1800b31d2d51f2ac3a124d7eed0 (diff) | |
| download | CMake-2dfe480a9c3fe40699ad85aa0355111848df870b.zip CMake-2dfe480a9c3fe40699ad85aa0355111848df870b.tar.gz CMake-2dfe480a9c3fe40699ad85aa0355111848df870b.tar.bz2 | |
Merge topic 'intel-c11-windows'
5d70894d Features: Update version of Intel Compiler on Windows supporting C 11
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Intel-C.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake index 6408392..9c67fbd 100644 --- a/Modules/Compiler/Intel-C.cmake +++ b/Modules/Compiler/Intel-C.cmake @@ -10,14 +10,17 @@ set(CMAKE_DEPFILE_FLAGS_C "-MD -MT <OBJECT> -MF <DEPFILE>") if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") set(_std -Qstd) set(_ext c) + if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 16.0.0) + set(CMAKE_C11_STANDARD_COMPILE_OPTION "-Qstd=c11") + set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-Qstd=c11") + endif() else() set(_std -std) set(_ext gnu) -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}=${_ext}11") + 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=gnu11") + endif() endif() if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0) |