summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestBuildAndTestHandler.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-06-18 13:07:53 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-06-18 13:07:53 (GMT)
commitbf3598bab440bc1fde01e6ddd3b8377e94758e0c (patch)
tree6190c7f0133ccc794f078c6a5d1bf29e50e72917 /Source/CTest/cmCTestBuildAndTestHandler.cxx
parent7a977df5669150d4f61489d6bf803d65cf791c71 (diff)
downloadCMake-bf3598bab440bc1fde01e6ddd3b8377e94758e0c.zip
CMake-bf3598bab440bc1fde01e6ddd3b8377e94758e0c.tar.gz
CMake-bf3598bab440bc1fde01e6ddd3b8377e94758e0c.tar.bz2
BUG: make sure ctest sees the output of the cmake run in build and test cases, it was not...
Diffstat (limited to 'Source/CTest/cmCTestBuildAndTestHandler.cxx')
-rw-r--r--Source/CTest/cmCTestBuildAndTestHandler.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index 9ec0217..ccd4ec1 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -143,6 +143,13 @@ void CMakeMessageCallback(const char* m, const char*, bool&, void* s)
*out += "\n";
}
+void CMakeProgressCallback(const char*msg, float , void * s)
+{
+ std::string* out = (std::string*)s;
+ *out += msg;
+ *out += "\n";
+}
+
//----------------------------------------------------------------------
void CMakeStdoutCallback(const char* m, int len, void* s)
{
@@ -210,6 +217,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
// should we cmake?
cmake cm;
+ cm.SetProgressCallback(CMakeProgressCallback, &cmakeOutString);
cm.SetGlobalGenerator(cm.CreateGlobalGenerator(
this->BuildGenerator.c_str()));