From bf3598bab440bc1fde01e6ddd3b8377e94758e0c Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 18 Jun 2008 09:07:53 -0400 Subject: BUG: make sure ctest sees the output of the cmake run in build and test cases, it was not... --- Source/CTest/cmCTestBuildAndTestHandler.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) 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())); -- cgit v0.12