[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1081-g1a7d314

[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  1a7d314ffa458eb33be199d0f18b3ef145e85cf9 (commit)
       via  5e428389615da64208c40be256a30f8c9e988523 (commit)
       via  1f8480312e41b281eccad13a4afcb7c1ef49f22a (commit)
      from  d54b5572bf91c0be866b1049421209d2a0320336 (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=1a7d314ffa458eb33be199d0f18b3ef145e85cf9
commit 1a7d314ffa458eb33be199d0f18b3ef145e85cf9
Merge: d54b557 5e42838
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 15:39:50 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 15:39:50 2016 -0500

    Merge topic 'intel-compile-features' into next
    
    5e428389 Features: Detect Intel C++14 mode more reliably
    1f848031 Features: Suppress c_static_assert test coverage on Intel <= 15


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e428389615da64208c40be256a30f8c9e988523
commit 5e428389615da64208c40be256a30f8c9e988523
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 15:34:39 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 15:37:05 2016 -0500

    Features: Detect Intel C++14 mode more reliably
    
    The `__cplusplus` macro is not defined to the language level reliably.
    When simulating MSVC it is always set to `1`.  When simulating GCC it is
    set to the lower value of the current language level and the maximum
    level supported by the simulated version of GCC (from observation).
    
    For MSVC we already used a combination of `__INTEL_CXX11_MODE__` and
    `__cpp_aggregate_nsdmi` to detect C++14 mode.  Extend this for general
    use by removing the condition on `_MSC_VER`.

diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index d1a3433..05c4189 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -21,7 +21,7 @@ set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) ||
 #if you are compiling as 98/11/14. So to properly detect C++14 with this version
 #we look for the existence of __GXX_EXPERIMENTAL_CXX0X__ but not __INTEL_CXX11_MODE__
 set(DETECT_BUGGY_ICC15 "((__INTEL_COMPILER == 1500) && (__INTEL_COMPILER_UPDATE == 1))")
-set(DETECT_CXX14 "((__cplusplus >= 201300L) || ((__cplusplus == 201103L) && !defined(__INTEL_CXX11_MODE__)) || ((${DETECT_BUGGY_ICC15}) && defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(__INTEL_CXX11_MODE__) ) || (defined(_MSC_VER) && defined(__INTEL_CXX11_MODE__) && defined(__cpp_aggregate_nsdmi)) )")
+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(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f8480312e41b281eccad13a4afcb7c1ef49f22a
commit 1f8480312e41b281eccad13a4afcb7c1ef49f22a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 15:27:15 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 15:29:25 2016 -0500

    Features: Suppress c_static_assert test coverage on Intel <= 15
    
    It works on some pre-15.0.2 versions but not others.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 9f61186..8acdd93 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -170,6 +170,15 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
   endif()
 endif()
 
+if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  if (CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.2)
+    # This works on some pre-15.0.2 versions and not others.
+    list(REMOVE_ITEM C_non_features
+      c_static_assert
+      )
+  endif()
+endif()
+
 set(C_ext c)
 set(C_standard_flag 11)
 set(CXX_ext cpp)

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

Summary of changes:
 Modules/Compiler/Intel-CXX-FeatureTests.cmake |    2 +-
 Tests/CompileFeatures/CMakeLists.txt          |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake