[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-764-g6738d19

[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  6738d19b2c8a64709fac9544f9df28be6531ac88 (commit)
       via  554b4f9010add22ef83bb22858f9fdcb52afbc7e (commit)
      from  1563b936fd11bb6512d7365a070a6185ffc9fbaf (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=6738d19b2c8a64709fac9544f9df28be6531ac88
commit 6738d19b2c8a64709fac9544f9df28be6531ac88
Merge: 1563b93 554b4f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 26 09:22:03 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 26 09:22:03 2016 -0400

    Merge topic 'intel-17-features' into next
    
    554b4f90 Features: Record features for Intel C++ 17 on UNIX


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=554b4f9010add22ef83bb22858f9fdcb52afbc7e
commit 554b4f9010add22ef83bb22858f9fdcb52afbc7e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 26 09:10:24 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 26 09:18:38 2016 -0400

    Features: Record features for Intel C++ 17 on UNIX
    
    Issue: #16384

diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index e111c07..57a05c8 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -1,6 +1,7 @@
 # References:
 #   - https://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler
 #   - https://software.intel.com/en-us/articles/c14-features-supported-by-intel-c-compiler
+#   - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0096r3.html
 
 # FIXME: Intel C++ feature detection works only when simulating the GNU compiler.
 # When simulating MSVC, Intel always sets __cplusplus to 199711L.
@@ -8,9 +9,8 @@ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
   return()
 endif()
 
-# these are not implemented in any version at time of writing
-#set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}")
-#set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}")
+set(_cmake_feature_test_cxx_variable_templates "__cpp_variable_templates >= 201304")
+set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304")
 
 set(_cmake_oldestSupported "__INTEL_COMPILER >= 1210")
 set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) || defined(__GXX_EXPERIMENTAL_CXX0X__))")

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

Summary of changes:
 Modules/Compiler/Intel-CXX-FeatureTests.cmake |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake