[Cmake-commits] CMake branch, next, updated. v3.1.0-1248-gff6f0a1

[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  ff6f0a122150fa577a2f37c14ddd06c1b8c387b7 (commit)
       via  2e9acb6d4335064f5c742e5f96eac604f1abfa23 (commit)
       via  1f7de54346142f05aef5814ee16754fba017b521 (commit)
      from  c7770933596f56c28d6dc43d618cab994410dea7 (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=ff6f0a122150fa577a2f37c14ddd06c1b8c387b7
commit ff6f0a122150fa577a2f37c14ddd06c1b8c387b7
Merge: c777093 2e9acb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 10:17:43 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 10:17:43 2014 -0500

    Merge topic 'update-kwsys' into next
    
    2e9acb6d Merge branch 'upstream-kwsys' into update-kwsys
    1f7de543 KWSys 2014-12-18 (87c65319)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e9acb6d4335064f5c742e5f96eac604f1abfa23
commit 2e9acb6d4335064f5c742e5f96eac604f1abfa23
Merge: cd7bde8 1f7de54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 10:17:20 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 18 10:17:20 2014 -0500

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f7de54346142f05aef5814ee16754fba017b521
commit 1f7de54346142f05aef5814ee16754fba017b521
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Thu Dec 18 08:31:15 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 18 10:17:16 2014 -0500

    KWSys 2014-12-18 (87c65319)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 87c65319 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' cc4046a8..87c65319
    Sean McBride (1):
          87c65319 SharedForward: Suppress clang -Wcast-qual warnings with conditional pragma
    
    Change-Id: I2f79780385aca7e0caa24e5bb0c0b4106b786c37

diff --git a/SharedForward.h.in b/SharedForward.h.in
index c6f345f..f22fa58 100644
--- a/SharedForward.h.in
+++ b/SharedForward.h.in
@@ -65,6 +65,15 @@
   See the comments below for specific explanations of each macro.
 */
 
+/* Disable -Wcast-qual warnings since they are too hard to fix in a
+   cross-platform way.  */
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning("-Wcast-qual")
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wcast-qual"
+# endif
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 /* Full path to the directory in which this executable is built.  Do
@@ -917,6 +926,13 @@ static int @KWSYS_NAMESPACE at _shared_forward_to_real(int argc, char** argv_in)
   return 1;
 }
 
+/* Restore warning stack.  */
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning("-Wcast-qual")
+#  pragma clang diagnostic pop
+# endif
+#endif
+
 #else
 # error "@KWSYS_NAMESPACE@/SharedForward.h should be included only once."
 #endif

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

Summary of changes:
 Source/kwsys/SharedForward.h.in |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)


hooks/post-receive
-- 
CMake