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

Makefile: Add progress to link step messages

This commit is contained in:
Brad King 2015-02-06 19:07:24 -05:00
parent c6ada8275b
commit 7bb50e4a31
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -171,15 +171,19 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
return; return;
} }
this->NumberOfProgressActions++;
if(!this->NoRuleMessages) if(!this->NoRuleMessages)
{ {
cmLocalUnixMakefileGenerator3::EchoProgress progress;
this->MakeEchoProgress(progress);
// Add the link message. // Add the link message.
std::string buildEcho = "Linking "; std::string buildEcho = "Linking ";
buildEcho += linkLanguage; buildEcho += linkLanguage;
buildEcho += " executable "; buildEcho += " executable ";
buildEcho += targetOutPath; buildEcho += targetOutPath;
this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(), this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
cmLocalUnixMakefileGenerator3::EchoLink); cmLocalUnixMakefileGenerator3::EchoLink,
&progress);
} }
// Build a list of compiler flags and linker flags. // Build a list of compiler flags and linker flags.

6
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -341,8 +341,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
this->Convert(targetFullPathImport,cmLocalGenerator::START_OUTPUT, this->Convert(targetFullPathImport,cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
this->NumberOfProgressActions++;
if(!this->NoRuleMessages) if(!this->NoRuleMessages)
{ {
cmLocalUnixMakefileGenerator3::EchoProgress progress;
this->MakeEchoProgress(progress);
// Add the link message. // Add the link message.
std::string buildEcho = "Linking "; std::string buildEcho = "Linking ";
buildEcho += linkLanguage; buildEcho += linkLanguage;
@ -365,7 +368,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
} }
buildEcho += targetOutPath.c_str(); buildEcho += targetOutPath.c_str();
this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(), this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
cmLocalUnixMakefileGenerator3::EchoLink); cmLocalUnixMakefileGenerator3::EchoLink,
&progress);
} }
const char* forbiddenFlagVar = 0; const char* forbiddenFlagVar = 0;