[Cmake-commits] CMake branch, next, updated. v3.0.0-4512-gd655bff

[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  d655bffdfa67691dccbcad2acf5be9891e9f37e7 (commit)
       via  8201e0826a5f11e2101d3e071c8da7cfdde833dc (commit)
      from  500c21da7f1427ad29e46d6c0dedc18d2a2d9044 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d655bffdfa67691dccbcad2acf5be9891e9f37e7
commit d655bffdfa67691dccbcad2acf5be9891e9f37e7
Merge: 500c21d 8201e08
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 09:36:14 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 09:36:14 2014 -0400

    Merge topic 'add-liblzma' into next
    
    8201e082 liblzma: Suppress more MSVC warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8201e0826a5f11e2101d3e071c8da7cfdde833dc
commit 8201e0826a5f11e2101d3e071c8da7cfdde833dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 09:35:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 09:35:35 2014 -0400

    liblzma: Suppress more MSVC warnings

diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h
index 2bcaeb3..c84f01c 100644
--- a/Utilities/cmliblzma/common/sysdefs.h
+++ b/Utilities/cmliblzma/common/sysdefs.h
@@ -18,6 +18,8 @@
 
 #if defined(_MSC_VER)
 # pragma warning(push,1)
+# pragma warning(disable: 4142) /* benign redefinition of type */
+# pragma warning(disable: 4761) /* integral size mismatch in argument */
 #endif
 
 //////////////

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

Summary of changes:
 Utilities/cmliblzma/common/sysdefs.h |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake