[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-641-g5aa11aa

[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, next has been updated
       via  5aa11aa1711543fdc55126798edd39626f30cb23 (commit)
       via  4af0c9daf41dfe08c776e77f5b19aebd81469479 (commit)
      from  9ec90185a7b3f26951c87318808752d590028d9b (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=5aa11aa1711543fdc55126798edd39626f30cb23
commit 5aa11aa1711543fdc55126798edd39626f30cb23
Merge: 9ec9018 4af0c9d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 18:31:41 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 31 14:31:52 2017 -0400

    Stage topic 'intel-compile-features'
    
    Topic-id: 23431
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/652


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4af0c9daf41dfe08c776e77f5b19aebd81469479
commit 4af0c9daf41dfe08c776e77f5b19aebd81469479
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 14:19:17 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 31 14:29:18 2017 -0400

    Features: Update features for Intel C++ 17.0.2 on UNIX
    
    Intel 17.0.2 on UNIX introduced a regression from 17.0.1 in its
    definition of `__cpp_constexpr` in `-std=c++14` mode.  It incorrectly
    defines it as `200704` instead of the expected `201304`.  Fix our
    feature detection table to account for this.

diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index e370647..929a7c6 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -13,7 +13,6 @@
 #     - __cpp_variadic_templates 200704
 
 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__))")
@@ -24,6 +23,9 @@ set(DETECT_BUGGY_ICC15 "((__INTEL_COMPILER == 1500) && (__INTEL_COMPILER_UPDATE
 set(DETECT_CXX14 "((__cplusplus >= 201300L) || ((__cplusplus == 201103L) && !defined(__INTEL_CXX11_MODE__)) || ((${DETECT_BUGGY_ICC15}) && defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(__INTEL_CXX11_MODE__) ) || (defined(__INTEL_CXX11_MODE__) && defined(__cpp_aggregate_nsdmi)) )")
 unset(DETECT_BUGGY_ICC15)
 
+set(Intel17_CXX14 "__INTEL_COMPILER >= 1700 && ${DETECT_CXX14}")
+set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 || (${Intel17_CXX14} && !defined(_MSC_VER))")
+
 set(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}")
 set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}")
 set(_cmake_feature_test_cxx_contextual_conversions "${Intel16_CXX14}")

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

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


hooks/post-receive
-- 
CMake