[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx 1.20 1.21

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jun 18 09:07:57 EDT 2008


Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv32370

Modified Files:
	cmCTestBuildAndTestHandler.cxx 
Log Message:
BUG: make sure ctest sees the output of the cmake run in build and test cases, it was not...


Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** cmCTestBuildAndTestHandler.cxx	17 Sep 2007 14:40:57 -0000	1.20
--- cmCTestBuildAndTestHandler.cxx	18 Jun 2008 13:07:53 -0000	1.21
***************
*** 144,147 ****
--- 144,154 ----
  }
  
+ 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)
***************
*** 211,214 ****
--- 218,222 ----
    // should we cmake?
    cmake cm;
+   cm.SetProgressCallback(CMakeProgressCallback, &cmakeOutString); 
    cm.SetGlobalGenerator(cm.CreateGlobalGenerator(
        this->BuildGenerator.c_str()));



More information about the Cmake-commits mailing list