kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: cleanup

Browse Source
This commit is contained in:
Ken Martin 2006-06-12 12:18:59 -04:00
parent 14cc1efe2c
commit ede1491f5a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmMakefileTargetGenerator.cxx
View File

@ -397,18 +397,12 @@ cmMakefileTargetGenerator
// Construct the build message. // Construct the build message.
std::vector<std::string> no_commands; std::vector<std::string> no_commands;
std::vector<std::string> 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 // add in a progress call if needed
cmGlobalUnixMakefileGenerator3* gg = cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
int prog = gg->ShouldAddProgressRule(); int prog = gg->ShouldAddProgressRule();
std::string progressDir = this->Makefile->GetHomeOutputDirectory(); std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += "/CMakeFiles"; progressDir += "/CMakeFiles";
cmOStringStream progCmd; cmOStringStream progCmd;
@ -423,7 +417,14 @@ cmMakefileTargetGenerator
push_back(prog); push_back(prog);
} }
commands.push_back(progCmd.str()); 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. // Construct the compile rules.
std::string compileRuleVar = "CMAKE_"; std::string compileRuleVar = "CMAKE_";
compileRuleVar += lang; compileRuleVar += lang;