[Cmake-commits] CMake branch, next, updated. v3.7.1-1698-g19cdfe4

[Daniel Pfeifer]

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  19cdfe464bf366f900aea1d6b60b506b96bd850f (commit)
       via  bfd06cc1b32a386690f6aa071f921947533da03c (commit)
      from  15fd34c75455508eb1d7cc95c2ed475b6cc503a1 (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=19cdfe464bf366f900aea1d6b60b506b96bd850f
commit 19cdfe464bf366f900aea1d6b60b506b96bd850f
Merge: 15fd34c bfd06cc
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Dec 11 15:37:41 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 11 15:37:41 2016 -0500

    Merge topic 'rebuild-lexers' into next
    
    bfd06cc1 fixup! Regenerate lexer source code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bfd06cc1b32a386690f6aa071f921947533da03c
commit bfd06cc1b32a386690f6aa071f921947533da03c
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Dec 11 21:33:04 2016 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Sun Dec 11 21:33:04 2016 +0100

    fixup! Regenerate lexer source code

diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h
index e0bee61..f906e47 100644
--- a/Source/cmStandardLexer.h
+++ b/Source/cmStandardLexer.h
@@ -20,9 +20,11 @@
 #endif
 
 #if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
+#if !defined(__INTEL_COMPILER)
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #endif
+#endif
 
 /* Make sure isatty is available. */
 #if defined(_WIN32) && !defined(__CYGWIN__)

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

Summary of changes:
 Source/cmStandardLexer.h |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake