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

ENH: fix for no newline on some makes fix for ctest and some symlinks

Browse Source
This commit is contained in:
Andy Cedilnik 2006-08-14 10:51:08 -04:00
parent c76a2bb4b2
commit 6b5403c586
3 changed files with 10 additions and 0 deletions

5
Source/CTest/cmCTestScriptHandler.cxx

@ -385,6 +385,11 @@ int cmCTestScriptHandler::ExtractVariables()
= this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY"); = this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY");
this->BinaryDir this->BinaryDir
= this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY"); = 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->CTestCmd
= this->Makefile->GetSafeDefinition("CTEST_COMMAND"); = this->Makefile->GetSafeDefinition("CTEST_COMMAND");
this->CVSCheckOut this->CVSCheckOut

4
Source/CTest/cmCTestStartCommand.cxx

@ -76,6 +76,10 @@ bool cmCTestStartCommand::InitialPass(
"as an argument or set CTEST_BINARY_DIRECTORY"); "as an argument or set CTEST_BINARY_DIRECTORY");
return false; return false;
} }
cmSystemTools::AddKeepPath(src_dir);
cmSystemTools::AddKeepPath(bld_dir);
this->CTest->EmptyCTestConfiguration(); this->CTest->EmptyCTestConfiguration();
this->CTest->SetCTestConfiguration("SourceDirectory", this->CTest->SetCTestConfiguration("SourceDirectory",
cmSystemTools::CollapseFullPath(src_dir).c_str()); cmSystemTools::CollapseFullPath(src_dir).c_str());

1
Source/cmMakefileTargetGenerator.cxx

@ -1187,6 +1187,7 @@ void cmMakefileTargetGenerator::WriteProgressVariables(unsigned long total,
} }
*progressFileStream << "\n"; *progressFileStream << "\n";
} }
*progressFileStream << "\n";
current += this->NumberOfProgressActions; current += this->NumberOfProgressActions;
delete progressFileStream; delete progressFileStream;
} }