[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1944-ga4f81d9

[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  a4f81d981e281636ac708bd6bd599a40c01a31d4 (commit)
       via  14252c08d04cff729ad6253e69d24bd6d4d8c63d (commit)
      from  a0c84560458844f92855dfa82d9f9b6f0854a640 (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=a4f81d981e281636ac708bd6bd599a40c01a31d4
commit a4f81d981e281636ac708bd6bd599a40c01a31d4
Merge: a0c8456 14252c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 5 19:48:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 5 19:48:33 2013 -0500

    Merge topic 'generator-toolset' into next
    
    14252c0 Use generator toolset error message with predictable whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14252c08d04cff729ad6253e69d24bd6d4d8c63d
commit 14252c08d04cff729ad6253e69d24bd6d4d8c63d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 5 19:44:55 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 5 19:44:55 2013 -0500

    Use generator toolset error message with predictable whitespace

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 97c4965..ba29589 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -82,9 +82,12 @@ cmGlobalGenerator::~cmGlobalGenerator()
 bool cmGlobalGenerator::SetGeneratorToolset(std::string const& ts)
 {
   cmOStringStream e;
-  e << this->GetName() <<
-    " generator does not support toolset specification, but "
-    "toolset \"" << ts << "\" was specified.";
+  e <<
+    "Generator\n"
+    "  " << this->GetName() << "\n"
+    "does not support toolset specification, but toolset\n"
+    "  " << ts << "\n"
+    "was specified.";
   this->CMakeInstance->IssueMessage(cmake::FATAL_ERROR, e.str(),
                                     cmListFileBacktrace());
   return false;
diff --git a/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt b/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
index 0c9e301..6150fef 100644
--- a/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
+++ b/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
@@ -1,3 +1,10 @@
 CMake Error:
-  [A-Za-z0-9 -]+ generator does not support toolset specification, but
-  toolset "Bad Toolset" was specified.$
+  Generator
+
+    [A-Za-z0-9 -]+
+
+  does not support toolset specification, but toolset
+
+    Bad Toolset
+
+  was specified.$

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

Summary of changes:
 Source/cmGlobalGenerator.cxx                       |    9 ++++++---
 .../GeneratorToolset/BadToolset-stderr.txt         |   11 +++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake