[Cmake-commits] CMake branch, next, updated. v3.7.2-2467-g036f34c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  036f34c7387b4e4cda45e8e2a3a7dc4e5cb6712c (commit)
       via  5d70894d4086b1800b31d2d51f2ac3a124d7eed0 (commit)
      from  9f309d00e86fea6ffe1deb30384d4789d5f90e45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=036f34c7387b4e4cda45e8e2a3a7dc4e5cb6712c
commit 036f34c7387b4e4cda45e8e2a3a7dc4e5cb6712c
Merge: 9f309d0 5d70894
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 1 08:56:24 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 08:56:24 2017 -0500

    Merge topic 'intel-c11-windows' into next
    
    5d70894d Features: Update version of Intel Compiler on Windows supporting C 11


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d70894d4086b1800b31d2d51f2ac3a124d7eed0
commit 5d70894d4086b1800b31d2d51f2ac3a124d7eed0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 08:31:41 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 1 08:55:50 2017 -0500

    Features: Update version of Intel Compiler on Windows supporting C 11
    
    The Intel Compiler 15.0.0 on Windows does not support `-Qstd=c11`.
    Bump our version requirement to 16 to use that flag.

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)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake