diff options
author | Ken Martin <ken.martin@kitware.com> | 2006-06-12 16:18:59 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2006-06-12 16:18:59 (GMT) |
commit | ede1491f5abf47fd741ab73e9974a054eb03d266 (patch) | |
tree | 898590785a252cde53d87679a4b861dda94e1104 /Source/cmMakefileTargetGenerator.cxx | |
parent | 14cc1efe2ce7690fcf689558bc1862f8f908c2cb (diff) | |
download | CMake-ede1491f5abf47fd741ab73e9974a054eb03d266.zip CMake-ede1491f5abf47fd741ab73e9974a054eb03d266.tar.gz CMake-ede1491f5abf47fd741ab73e9974a054eb03d266.tar.bz2 |
ENH: cleanup
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 7ab801b..a030679 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -397,18 +397,12 @@ cmMakefileTargetGenerator // Construct the build message. std::vector<std::string> no_commands; std::vector<std::string> commands; - std::string buildEcho = "Building "; - buildEcho += lang; - buildEcho += " object "; - buildEcho += relativeObj; - this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(), - cmLocalUnixMakefileGenerator3::EchoBuild); - + // add in a progress call if needed cmGlobalUnixMakefileGenerator3* gg = static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); int prog = gg->ShouldAddProgressRule(); - + std::string progressDir = this->Makefile->GetHomeOutputDirectory(); progressDir += "/CMakeFiles"; cmOStringStream progCmd; @@ -423,7 +417,14 @@ cmMakefileTargetGenerator push_back(prog); } commands.push_back(progCmd.str()); - + + std::string buildEcho = "Building "; + buildEcho += lang; + buildEcho += " object "; + buildEcho += relativeObj; + this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(), + cmLocalUnixMakefileGenerator3::EchoBuild); + // Construct the compile rules. std::string compileRuleVar = "CMAKE_"; compileRuleVar += lang; |