[Cmake-commits] CMake branch, next, updated. v2.8.5-1805-g6ac0d06

[David Cole]

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  6ac0d0682748999d5dab9f410686518eff5ea21b (commit)
       via  79701929fb7dc3a8aee913866bc8f9352af57ee7 (commit)
      from  e1184c9a3418e3237b5e3712143591ae56f1d5ec (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=6ac0d0682748999d5dab9f410686518eff5ea21b
commit 6ac0d0682748999d5dab9f410686518eff5ea21b
Merge: e1184c9 7970192
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 2 14:22:23 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 14:22:23 2011 -0400

    Merge topic 'suppress-qt-warning' into next
    
    7970192 Suppress Qt warning for dashmacmini5 builds


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79701929fb7dc3a8aee913866bc8f9352af57ee7
commit 79701929fb7dc3a8aee913866bc8f9352af57ee7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 2 14:20:02 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Sep 2 14:20:02 2011 -0400

    Suppress Qt warning for dashmacmini5 builds
    
    The clang and icc compilers see two lines of warning with
    essentially the same message. But the second line does not
    say qglobal.h, so remove that part of the warning exclusion
    regex. See parent commit for further comments regarding this
    warning exclusion.

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index d11f515..0e61da4 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -43,7 +43,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
   "CMakeSetupManifest.xml.*manifest authoring warning.*Unrecognized Element"
   "cc-3968 CC: WARNING File.*" # "implicit" truncation by static_cast
   "ld: warning: directory not found for option .-(F|L)"
-  "qglobal.h.*warning.*This version of Mac OS X is unsupported"
+  "warning.*This version of Mac OS X is unsupported"
   )
 
 IF(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")

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

Summary of changes:
 CTestCustom.cmake.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake