[Cmake-commits] CMake branch, next, updated. v2.8.3-933-ge0c07c2

[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  e0c07c295ec983cdc8e27b8b323d83befcc4d98d (commit)
       via  1f7133cd61c88bbb60e5695312c91c7a3238a707 (commit)
      from  0dc5fd7c65e2f8c360fd63412b481abc2e758e38 (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=e0c07c295ec983cdc8e27b8b323d83befcc4d98d
commit e0c07c295ec983cdc8e27b8b323d83befcc4d98d
Merge: 0dc5fd7 1f7133c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 16 08:08:37 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 16 08:08:37 2010 -0500

    Merge topic 'ctest-depend-cycle' into next
    
    1f7133c CTest: Fix line-too-long style in DEPEND cycle error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f7133cd61c88bbb60e5695312c91c7a3238a707
commit 1f7133cd61c88bbb60e5695312c91c7a3238a707
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 16 08:07:43 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 16 08:07:43 2010 -0500

    CTest: Fix line-too-long style in DEPEND cycle error

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index ca26c98..94614cf 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -669,10 +669,10 @@ bool cmCTestMultiProcessHandler::CheckCycles()
           if(*d == root)
             {
             //cycle exists
-            cmCTestLog(this->CTest, ERROR_MESSAGE, "Error: a cycle exists in "
-                       "the test dependency graph for the test \""
-                       << this->Properties[root]->Name << "\"." << std::endl
-                       << "Please fix the cycle and run ctest again." << std::endl);
+            cmCTestLog(this->CTest, ERROR_MESSAGE,
+                       "Error: a cycle exists in the test dependency graph "
+                       "for the test \"" << this->Properties[root]->Name <<
+                       "\".\nPlease fix the cycle and run ctest again.\n");
             return false;
             }
           else

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake