[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1946-g2d7bda3

[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  2d7bda312b7a9d958e0758e43631b0b90a9616fd (commit)
       via  ed40cfd4e6e8f5973fcf6daf7a2c38e739b47232 (commit)
      from  a4f81d981e281636ac708bd6bd599a40c01a31d4 (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=2d7bda312b7a9d958e0758e43631b0b90a9616fd
commit 2d7bda312b7a9d958e0758e43631b0b90a9616fd
Merge: a4f81d9 ed40cfd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 6 07:39:21 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 6 07:39:21 2013 -0500

    Merge topic 'generator-toolset' into next
    
    ed40cfd Fix RunCMake.GeneratorToolset test on VS 7.1


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed40cfd4e6e8f5973fcf6daf7a2c38e739b47232
commit ed40cfd4e6e8f5973fcf6daf7a2c38e739b47232
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 6 07:37:38 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 6 07:38:20 2013 -0500

    Fix RunCMake.GeneratorToolset test on VS 7.1
    
    Match the generator name in the BadToolset test case error message with
    the regular expression ".*" rather than trying to predict all characters
    used in a generator name.

diff --git a/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt b/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
index 6150fef..bf1f190 100644
--- a/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
+++ b/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
@@ -1,7 +1,7 @@
 CMake Error:
   Generator
 
-    [A-Za-z0-9 -]+
+    .*
 
   does not support toolset specification, but toolset
 

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

Summary of changes:
 .../GeneratorToolset/BadToolset-stderr.txt         |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake