BUG: make sure ctest sees the output of the cmake run in build and test cases, it was not...
This commit is contained in:
parent
7a977df566
commit
bf3598bab4
|
@ -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()));
|
||||
|
||||
|
|
Loading…
Reference in New Issue