[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1070-gd2bb979

[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  d2bb979f043dc2a86e4953e5b6336004e7183163 (commit)
       via  be73273952974e15ed12cf41180162bbbda70da3 (commit)
      from  15fb77871ef8e4617817bdbd6bb3189f7406b551 (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=d2bb979f043dc2a86e4953e5b6336004e7183163
commit d2bb979f043dc2a86e4953e5b6336004e7183163
Merge: 15fb778 be73273
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 13:20:33 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 13:20:33 2016 -0500

    Merge topic 'intel-compile-features-windows-15' into next
    
    be732739 Features: Fix standards and features for Intel 15 on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be73273952974e15ed12cf41180162bbbda70da3
commit be73273952974e15ed12cf41180162bbbda70da3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 11:50:12 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 12:54:06 2016 -0500

    Features: Fix standards and features for Intel 15 on Windows
    
    The Intel 15 compiler for Windows does not support the same set of
    standards and features as the same version for other platforms.

diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index d1a3433..e3cd276 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -49,7 +49,7 @@ set(Intel15_CXX11 "__INTEL_COMPILER >= 1500 && ${DETECT_CXX11}")
 set(_cmake_feature_test_cxx_alignas "${Intel15_CXX11}")
 set(_cmake_feature_test_cxx_alignof "${Intel15_CXX11}")
 set(_cmake_feature_test_cxx_inheriting_constructors "${Intel15_CXX11}")
-set(_cmake_feature_test_cxx_user_literals "__cpp_user_defined_literals >= 200809 || ${Intel15_CXX11}")
+set(_cmake_feature_test_cxx_user_literals "__cpp_user_defined_literals >= 200809 || (${Intel15_CXX11} && (!defined(_MSC_VER) || __INTEL_COMPILER >= 1600))")
 set(_cmake_feature_test_cxx_thread_local "${Intel15_CXX11}")
 unset(Intel15_CXX11)
 
@@ -64,7 +64,7 @@ set(_cmake_feature_test_cxx_sizeof_member "${Intel14_CXX11}")
 set(_cmake_feature_test_cxx_strong_enums "${Intel14_CXX11}")
 set(_cmake_feature_test_cxx_reference_qualified_functions "${Intel14_CXX11}")
 set(_cmake_feature_test_cxx_raw_string_literals "__cpp_raw_strings >= 200710 || ${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_unicode_literals "__cpp_unicode_literals >= 200710 || ${Intel14_CXX11}")
+set(_cmake_feature_test_cxx_unicode_literals "__cpp_unicode_literals >= 200710 || (${Intel14_CXX11} && (!defined(_MSC_VER) || __INTEL_COMPILER >= 1600))")
 set(_cmake_feature_test_cxx_inline_namespaces "${Intel14_CXX11}")
 set(_cmake_feature_test_cxx_unrestricted_unions "${Intel14_CXX11}")
 set(_cmake_feature_test_cxx_nonstatic_member_init "${Intel14_CXX11}")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 6673a2d..d01d38d 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -10,19 +10,23 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MD -MT <OBJECT> -MF <DEPFILE>")
 if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
   set(_std -Qstd)
   set(_ext c++)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
+    set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-Qstd=c++14")
+    # todo: there is no gnu++14 value supported; figure out what to do
+    set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd=c++14")
+  endif()
 else()
   set(_std -std)
   set(_ext gnu++)
-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
-  set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "${_std}=c++14")
-elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
-  set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "${_std}=c++1y")
-  # todo: there is no gnu++14 value supported; figure out what to do
-  set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "${_std}=c++1y")
+  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
+    set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++14")
+  elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
+    set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
+    # todo: there is no gnu++14 value supported; figure out what to do
+    set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++1y")
+  endif()
 endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
@@ -62,7 +66,9 @@ unset(_ext)
 macro(cmake_record_cxx_compile_features)
   set(_result 0)
   if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0
+        OR (NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" AND
+            NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0))
       _record_compiler_features_cxx(14)
     endif()
     if (_result EQUAL 0)

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

Summary of changes:
 Modules/Compiler/Intel-CXX-FeatureTests.cmake |    4 ++--
 Modules/Compiler/Intel-CXX.cmake              |   28 +++++++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake