[Cmake-commits] CMake branch, next, updated. v3.7.2-2435-g698f524

[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  698f5243cde7238cb289f1750e56a01d571591e7 (commit)
       via  ef372b3a0a6b1d6c915ba404ec0acb83e6d89925 (commit)
       via  07d3695e75d1bbeaa571901708350efc3f936e0e (commit)
      from  e2025bcc8ba13eef8f2e8f6709128f845dc3ff2b (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=698f5243cde7238cb289f1750e56a01d571591e7
commit 698f5243cde7238cb289f1750e56a01d571591e7
Merge: e2025bc ef372b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 08:49:06 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 08:49:06 2017 -0500

    Merge topic 'intel-c11-windows' into next
    
    ef372b3a Features: Update version of Intel Compiler on Windows supporting C 11
    07d3695e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef372b3a0a6b1d6c915ba404ec0acb83e6d89925
commit ef372b3a0a6b1d6c915ba404ec0acb83e6d89925
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: Tue Jan 31 08:31:41 2017 -0500

    Features: Update version of Intel Compiler on Windows supporting C 11
    
    The Intel Compiler 15.0.0 on Windows does not support `-std=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:
 Modules/Compiler/Intel-C.cmake |   13 ++++++++-----
 Source/CMakeVersion.cmake      |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake