kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: make sure ctest sees the output of the cmake run in build and test cases, it was not...

Browse Source
This commit is contained in:
Bill Hoffman 2008-06-18 09:07:53 -04:00
parent 7a977df566
commit bf3598bab4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestBuildAndTestHandler.cxx
View File

@ -143,6 +143,13 @@ void CMakeMessageCallback(const char* m, const char*, bool&, void* s)
*out += "\n"; *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) void CMakeStdoutCallback(const char* m, int len, void* s)
{ {
@ -210,6 +217,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
// should we cmake? // should we cmake?
cmake cm; cmake cm;
cm.SetProgressCallback(CMakeProgressCallback, &cmakeOutString);
cm.SetGlobalGenerator(cm.CreateGlobalGenerator( cm.SetGlobalGenerator(cm.CreateGlobalGenerator(
this->BuildGenerator.c_str())); this->BuildGenerator.c_str()));