[Cmake-commits] CMake branch, next, updated. v3.0.0-4086-g402be9c

[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  402be9c58e49356d556b41dd01c8e66266d2b6fc (commit)
       via  f33d875a844114945f3e698266639a63401f6ac1 (commit)
      from  db98e04debb3b13fbacc3359edfb0b8047079513 (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=402be9c58e49356d556b41dd01c8e66266d2b6fc
commit 402be9c58e49356d556b41dd01c8e66266d2b6fc
Merge: db98e04 f33d875
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 2 10:39:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 2 10:39:38 2014 -0400

    Merge topic 'ctest-S-message-STATUS' into next
    
    f33d875a CTest: Implement message(STATUS) output for 'ctest -S' scripts


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f33d875a844114945f3e698266639a63401f6ac1
commit f33d875a844114945f3e698266639a63401f6ac1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 2 10:23:23 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 2 10:39:30 2014 -0400

    CTest: Implement message(STATUS) output for 'ctest -S' scripts
    
    Send status messages to the CTest HANDLER_OUTPUT log since they are part
    of the script handler output.  This also ensures they appear inline with
    other test command handler output.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 567acfc..f050148 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -317,6 +317,15 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg)
   return retVal;
 }
 
+static void ctestScriptProgressCallback(const char *m, float, void* cd)
+{
+  cmCTest* ctest = static_cast<cmCTest*>(cd);
+  if(m && *m)
+    {
+    cmCTestLog(ctest, HANDLER_OUTPUT, "-- " << m << std::endl);
+    }
+}
+
 void cmCTestScriptHandler::CreateCMake()
 {
   // create a cmake instance to read the configuration script
@@ -334,6 +343,8 @@ void cmCTestScriptHandler::CreateCMake()
   this->LocalGenerator = this->GlobalGenerator->CreateLocalGenerator();
   this->Makefile = this->LocalGenerator->GetMakefile();
 
+  this->CMake->SetProgressCallback(ctestScriptProgressCallback, this->CTest);
+
   // Set CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR.
   // Also, some commands need Makefile->GetCurrentDirectory().
   std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();

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

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)


hooks/post-receive
-- 
CMake