[Cmake-commits] CMake branch, master, updated. v3.10.2-946-ga271286

[Kitware Robot]

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, master has been updated
       via  a271286f417731916cd60c546665ec030bc5b2c7 (commit)
       via  c3d576f5d685f2703ebed0dd0e76209b0fd6e6cf (commit)
       via  4a5727d375e893f147b46e2a58aea647a9afddcf (commit)
      from  53f77fad2f305d84b7cc7a15ebee6fa0afbd237e (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=a271286f417731916cd60c546665ec030bc5b2c7
commit a271286f417731916cd60c546665ec030bc5b2c7
Merge: 53f77fa c3d576f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 29 13:04:22 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 29 08:04:28 2018 -0500

    Merge topic 'intel-cxx17-flags'
    
    c3d576f5 Intel: Add C++17 compiler options
    4a5727d3 Intel: Correct the C11 ext flag
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1711


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3d576f5d685f2703ebed0dd0e76209b0fd6e6cf
commit c3d576f5d685f2703ebed0dd0e76209b0fd6e6cf
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Sat Jan 27 15:08:39 2018 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Sat Jan 27 15:09:58 2018 +0100

    Intel: Add C++17 compiler options
    
    Since Intel C++ 18.0, some C++17 features are supported if the flags
    -std=c++17, respectively /Qstd=c++17 are given.
    
    Fixes: #17687

diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 0eb9e1f..d9c5749 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -9,6 +9,11 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MD -MT <OBJECT> -MF <DEPFILE>")
 
 if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
 
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0)
+    set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-Qstd=c++17")
+    set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd=c++17")
+  endif()
+
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
     set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-Qstd=c++14")
     set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd=c++14")
@@ -29,6 +34,12 @@ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
 
 else()
 
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0)
+    set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17")
+    # todo: there is no gnu++17 value supported; figure out what to do
+    set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=c++17")
+  endif()
+
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
     set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
     # todo: there is no gnu++14 value supported; figure out what to do

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a5727d375e893f147b46e2a58aea647a9afddcf
commit 4a5727d375e893f147b46e2a58aea647a9afddcf
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Sat Jan 27 15:08:00 2018 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Sat Jan 27 15:08:00 2018 +0100

    Intel: Correct the C11 ext flag
    
    Intel does not support a 'gnu11' standard flag, only 'c11'.

diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 4e4af29..3e0439f 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -25,7 +25,8 @@ else()
 
   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")
+    # todo: there is no gnu11 value supported; figure out what to do
+    set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=c11")
   endif()
 
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)

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

Summary of changes:
 Modules/Compiler/Intel-C.cmake   |    3 ++-
 Modules/Compiler/Intel-CXX.cmake |   11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake