diff options
author | Ken Martin <ken.martin@kitware.com> | 2006-05-23 13:11:46 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2006-05-23 13:11:46 (GMT) |
commit | 50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef (patch) | |
tree | 980f4a317110d0903d24e45486a840790833972f /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | 4a2d72d313a0ee9463a6baac7a10ed6610159e38 (diff) | |
download | CMake-50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef.zip CMake-50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef.tar.gz CMake-50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef.tar.bz2 |
ENH: always compile progress
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index a69ae73..e2d3f89 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1408,13 +1408,32 @@ void cmLocalUnixMakefileGenerator3 depends.push_back("cmake_check_build_system"); + if (!this->Parent) + { + cmGlobalUnixMakefileGenerator3 *gg = + static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); + cmOStringStream progCmd; + progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; + progCmd << this->Makefile->GetHomeOutputDirectory(); + progCmd << "/CMakeFiles 100"; + commands.push_back(progCmd.str()); + } + commands.push_back (this->GetRecursiveMakeCall("CMakeFiles/Makefile2",dir.c_str())); this->CreateCDCommand(commands, this->Makefile->GetHomeOutputDirectory(), this->Makefile->GetStartOutputDirectory()); - std::string echoCommand = "@echo \"\""; - commands.push_back(echoCommand.c_str()); + if (!this->Parent) + { + cmGlobalUnixMakefileGenerator3 *gg = + static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); + cmOStringStream progCmd; + progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; + progCmd << this->Makefile->GetHomeOutputDirectory(); + progCmd << "/CMakeFiles 0"; + commands.push_back(progCmd.str()); + } this->WriteMakeRule(ruleFileStream, "The main all target", "all", depends, commands, true); |