ENH: fix for no newline on some makes fix for ctest and some symlinks
This commit is contained in:
parent
c76a2bb4b2
commit
6b5403c586
|
@ -385,6 +385,11 @@ int cmCTestScriptHandler::ExtractVariables()
|
|||
= this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY");
|
||||
this->BinaryDir
|
||||
= this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY");
|
||||
|
||||
// add in translations for src and bin
|
||||
cmSystemTools::AddKeepPath(this->SourceDir.c_str());
|
||||
cmSystemTools::AddKeepPath(this->BinaryDir.c_str());
|
||||
|
||||
this->CTestCmd
|
||||
= this->Makefile->GetSafeDefinition("CTEST_COMMAND");
|
||||
this->CVSCheckOut
|
||||
|
|
|
@ -76,6 +76,10 @@ bool cmCTestStartCommand::InitialPass(
|
|||
"as an argument or set CTEST_BINARY_DIRECTORY");
|
||||
return false;
|
||||
}
|
||||
|
||||
cmSystemTools::AddKeepPath(src_dir);
|
||||
cmSystemTools::AddKeepPath(bld_dir);
|
||||
|
||||
this->CTest->EmptyCTestConfiguration();
|
||||
this->CTest->SetCTestConfiguration("SourceDirectory",
|
||||
cmSystemTools::CollapseFullPath(src_dir).c_str());
|
||||
|
|
|
@ -1187,6 +1187,7 @@ void cmMakefileTargetGenerator::WriteProgressVariables(unsigned long total,
|
|||
}
|
||||
*progressFileStream << "\n";
|
||||
}
|
||||
*progressFileStream << "\n";
|
||||
current += this->NumberOfProgressActions;
|
||||
delete progressFileStream;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue