diff options
| author | Ken Martin <ken.martin@kitware.com> | 2006-07-12 17:11:27 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2006-07-12 17:11:27 (GMT) |
| commit | ed54b93533c00d4f4ecbbbb7dfe82d7c238b30a5 (patch) | |
| tree | 42df7d2e5b0918398b5d2eab70dfa009c164fc7e /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 6bdff065941d020ea9e61fe19daa810cce653c04 (diff) | |
| download | CMake-ed54b93533c00d4f4ecbbbb7dfe82d7c238b30a5.zip CMake-ed54b93533c00d4f4ecbbbb7dfe82d7c238b30a5.tar.gz CMake-ed54b93533c00d4f4ecbbbb7dfe82d7c238b30a5.tar.bz2 | |
ENH: added progress for subdir all targets and fixed compiler waring
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 2252c16..94c9094 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -150,7 +150,10 @@ void cmLocalUnixMakefileGenerator3 delete *mtgIter; } this->TargetGenerators.clear(); +} +void cmLocalUnixMakefileGenerator3::WriteAllProgressVariable() +{ // write the top level progress for the all target std::string progressFileNameFull = this->ConvertToFullPath("progress.make"); @@ -1447,7 +1450,7 @@ void cmLocalUnixMakefileGenerator3 progCmd << this->Convert(progressDir.c_str(), cmLocalGenerator::FULL, cmLocalGenerator::SHELL); - progCmd << " $(CMAKE_ALL_PROGRESS)\n"; + progCmd << " $(CMAKE_ALL_PROGRESS)"; commands.push_back(progCmd.str()); } std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash(); @@ -1457,7 +1460,6 @@ void cmLocalUnixMakefileGenerator3 this->CreateCDCommand(commands, this->Makefile->GetHomeOutputDirectory(), this->Makefile->GetStartOutputDirectory()); - if (!this->Parent) { cmOStringStream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0 |