[Cmake-commits] CMake branch, next, updated. v3.0.0-4577-g90febc3

[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  90febc35eae3a662b80c81d35911e05c56fd1284 (commit)
       via  3227e676d4f95a667d7de177322894b8d82c23ed (commit)
      from  9b6285615ccbb54be13a758962cfd75fcf007a09 (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=90febc35eae3a662b80c81d35911e05c56fd1284
commit 90febc35eae3a662b80c81d35911e05c56fd1284
Merge: 9b62856 3227e67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 29 08:38:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 29 08:38:19 2014 -0400

    Merge topic 'add-liblzma' into next
    
    3227e676 libarchive: Suppress MSVC warning C4142 from lzma.h


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3227e676d4f95a667d7de177322894b8d82c23ed
commit 3227e676d4f95a667d7de177322894b8d82c23ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 29 08:37:29 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 29 08:37:52 2014 -0400

    libarchive: Suppress MSVC warning C4142 from lzma.h

diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h
index 9a19cdf..dc2f241 100644
--- a/Utilities/cmlibarchive/libarchive/archive_windows.h
+++ b/Utilities/cmlibarchive/libarchive/archive_windows.h
@@ -76,6 +76,7 @@
 
 #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; conversion supplied */
 #endif
 #if defined(__BORLANDC__)

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_windows.h |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake