diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-08-14 14:51:08 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-08-14 14:51:08 (GMT) |
| commit | 6b5403c5861771dee082c0040a6f91162ccb9c32 (patch) | |
| tree | 825586a8571716b7a376507f984a0d59f1ada10e | |
| parent | c76a2bb4b22c06b47955a8f5dde4629633ff76a1 (diff) | |
| download | CMake-6b5403c5861771dee082c0040a6f91162ccb9c32.zip CMake-6b5403c5861771dee082c0040a6f91162ccb9c32.tar.gz CMake-6b5403c5861771dee082c0040a6f91162ccb9c32.tar.bz2 | |
ENH: fix for no newline on some makes fix for ctest and some symlinks
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 5 | ||||
| -rw-r--r-- | Source/CTest/cmCTestStartCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 152a634..29ab2d6 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -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 diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 30aff0b..01b48c2 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -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()); diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index ae65daa..098aa42 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1187,6 +1187,7 @@ void cmMakefileTargetGenerator::WriteProgressVariables(unsigned long total, } *progressFileStream << "\n"; } + *progressFileStream << "\n"; current += this->NumberOfProgressActions; delete progressFileStream; } |