[Cmake-commits] CMake branch, next, updated. v2.8.11-2162-g078780a

[Rolf Eike Beer]

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  078780a7c3ffbac2b9217792faa814b8814ed5fa (commit)
       via  0aed09fd20b841a34381584b2058e1f994154f74 (commit)
      from  12dae4afb79cb0e0d7ee1f82d7aeb664fd5ed4e2 (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=078780a7c3ffbac2b9217792faa814b8814ed5fa
commit 078780a7c3ffbac2b9217792faa814b8814ed5fa
Merge: 12dae4a 0aed09f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 23 00:32:34 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 23 00:32:34 2013 -0400

    Merge topic 'Memchecker-Mac-fix' into next
    
    0aed09f Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0aed09fd20b841a34381584b2058e1f994154f74
commit 0aed09fd20b841a34381584b2058e1f994154f74
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 23 06:31:47 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 23 06:31:47 2013 +0200

    Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 59d6816..60df75c 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(memcheck_fail CMakeLib)
 # same filenames.
 add_subdirectory(NoLogDummyChecker)
 
-if (XCODE)
+if (APPLE)
     # filter out additional messages by Guard Malloc integrated in Xcode
     set(GUARD_MALLOC_MSG "(ctest\([0-9]+\) malloc: [^\n]*\n)*")
     set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+\\.[0-9]+ sec\n${GUARD_MALLOC_MSG}\n${GUARD_MALLOC_MSG}100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \n${GUARD_MALLOC_MSG}Memory checking results:\n${GUARD_MALLOC_MSG}")

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

Summary of changes:
 Tests/CTestTestMemcheck/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake