mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-26 23:20:18 +02:00
e13720c3c4
This commit is related to: - https://github.com/NixOS/nixpkgs/issues/762 - http://public.kitware.com/Bug/view.php?id=13887 And fixes a bug present in recent CMake versions. The fix should be integrated in the next CMake release.
18 lines
889 B
Diff
18 lines
889 B
Diff
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
|
|
index e7491bb..57b4348 100644
|
|
--- a/Source/CTest/cmCTestTestHandler.cxx
|
|
+++ b/Source/CTest/cmCTestTestHandler.cxx
|
|
@@ -1303,10 +1303,9 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
|
|
for ( it = vec.begin(); it != vec.end(); ++it )
|
|
{
|
|
int retVal = 0;
|
|
- std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str());
|
|
- cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd
|
|
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
|
|
<< std::endl);
|
|
- if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0,
|
|
+ if ( !cmSystemTools::RunSingleCommand((*it).c_str(), 0, &retVal, 0,
|
|
cmSystemTools::OUTPUT_MERGE
|
|
/*this->Verbose*/) || retVal != 0 )
|
|
{
|