From ede1491f5abf47fd741ab73e9974a054eb03d266 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Mon, 12 Jun 2006 12:18:59 -0400 Subject: ENH: cleanup --- Source/cmMakefileTargetGenerator.cxx | 19 ++++++++++--------- 1 file 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 no_commands; std::vector 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(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; -- cgit v0.12