[Cmake-commits] CMake branch, master, updated. 4d653fb4eebd4819f3283d27844daf6f12ca24c6

[cmake-commits at cmake.org]

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, master has been updated
       via  4d653fb4eebd4819f3283d27844daf6f12ca24c6 (commit)
      from  a443308c37c41edf75dabaf87feee33bb57212b6 (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=4d653fb4eebd4819f3283d27844daf6f12ca24c6
commit 4d653fb4eebd4819f3283d27844daf6f12ca24c6
Author: Brad King <brad.king at kitware.com>
Date:   Thu May 6 14:37:55 2010 -0400

    Fix 'Architecture' test for more Mac linkers
    
    Some Mac linkers produce the message
    
      "file was built for unsupported file format which is not the
       architecture being linked"
    
    for this test.  Update the test output regex to match it.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 07f5e7d..6159265 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -159,7 +159,7 @@ IF(BUILD_TESTING)
   IF(CTEST_TEST_OSX_ARCH)
     ADD_TEST_MACRO(Architecture Architecture)
     SET_TESTS_PROPERTIES(Architecture PROPERTIES
-      PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype)")
+      PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype|not the architecture being linked)")
   ENDIF(CTEST_TEST_OSX_ARCH)
 
   LIST(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})

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

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


hooks/post-receive
-- 
CMake