[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-371-g4cf2470

[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  4cf2470621cbbac31a9be8104bde38aba076c924 (commit)
       via  48a0d9a0b174df7a005da8d9bd70f47236940c7c (commit)
       via  fdb6c2967d19a71ef3da16a9a4e592bd15d143f9 (commit)
      from  4c7858bec811a3f20a3c52032935e0d255a6cfbf (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=4cf2470621cbbac31a9be8104bde38aba076c924
commit 4cf2470621cbbac31a9be8104bde38aba076c924
Merge: 4c7858b 48a0d9a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 09:28:51 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 8 09:28:51 2016 -0500

    Merge topic 'update-kwsys' into next
    
    48a0d9a0 Merge branch 'upstream-KWSys' into update-kwsys
    fdb6c296 KWSys 2016-03-08 (6b60c184)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48a0d9a0b174df7a005da8d9bd70f47236940c7c
commit 48a0d9a0b174df7a005da8d9bd70f47236940c7c
Merge: ba9d5af fdb6c29
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 09:28:33 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 8 09:28:33 2016 -0500

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2016-03-08 (6b60c184)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdb6c2967d19a71ef3da16a9a4e592bd15d143f9
commit fdb6c2967d19a71ef3da16a9a4e592bd15d143f9
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Tue Mar 8 09:25:26 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 8 09:28:19 2016 -0500

    KWSys 2016-03-08 (6b60c184)
    
    Code extracted from:
    
        http://public.kitware.com/KWSys.git
    
    at commit 6b60c1843dbba9d4929496f9292cc78dab945c68 (master).
    
    Upstream Shortlog
    -----------------
    
    Mariusz Pluciński (1):
          6b60c184 SystemInformation: Fix compilation on VS Clang/C2 toolset

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 1d8723c..512d5fb 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -200,13 +200,13 @@ typedef struct rlimit ResourceLimitType;
 # endif
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_WIN64)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_WIN64) && !defined(__clang__)
 #define USE_ASM_INSTRUCTIONS 1
 #else
 #define USE_ASM_INSTRUCTIONS 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__clang__)
 #include <intrin.h>
 #define USE_CPUID_INTRINSICS 1
 #else

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake