[Cmake-commits] CMake branch, next, updated. v2.8.7-2179-g0e3ad86

[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  0e3ad866235cf1d12766fcc5a0f68d248599880d (commit)
       via  8892c8d00bc62bac2ebc5b089e16dc730350f75f (commit)
      from  aababf9947a4e35ee708c40f2b9146bbf8f887a2 (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=0e3ad866235cf1d12766fcc5a0f68d248599880d
commit 0e3ad866235cf1d12766fcc5a0f68d248599880d
Merge: aababf9 8892c8d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 21 06:10:09 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 21 06:10:09 2012 -0500

    Merge topic 'uninitialized-var-in-if' into next
    
    8892c8d If() test: fix match expression for in-place builds


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8892c8d00bc62bac2ebc5b089e16dc730350f75f
commit 8892c8d00bc62bac2ebc5b089e16dc730350f75f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 21 10:34:11 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jan 21 10:34:11 2012 +0100

    If() test: fix match expression for in-place builds

diff --git a/Tests/CMakeTests/IfTest.cmake.in b/Tests/CMakeTests/IfTest.cmake.in
index 43a15d4..639e226 100644
--- a/Tests/CMakeTests/IfTest.cmake.in
+++ b/Tests/CMakeTests/IfTest.cmake.in
@@ -158,7 +158,7 @@ endforeach()
 test_vars("")
 
 set(Invalid-Argument-RESULT 1)
-set(Invalid-Argument-STDERR ".*CMake Error at @CMAKE_CURRENT_SOURCE_DIR@/If-Invalid-Argument.cmake:1 \\(if\\):.*Unknown arguments specified.*")
+set(Invalid-Argument-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?If-Invalid-Argument.cmake:1 \\(if\\):.*Unknown arguments specified.*")
 
 include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake")
 check_cmake_test(If

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

Summary of changes:
 Tests/CMakeTests/IfTest.cmake.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake