Makefile: Add progress to link step messages
This commit is contained in:
parent
c6ada8275b
commit
7bb50e4a31
|
@ -171,15 +171,19 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
|
|||
return;
|
||||
}
|
||||
|
||||
this->NumberOfProgressActions++;
|
||||
if(!this->NoRuleMessages)
|
||||
{
|
||||
cmLocalUnixMakefileGenerator3::EchoProgress progress;
|
||||
this->MakeEchoProgress(progress);
|
||||
// Add the link message.
|
||||
std::string buildEcho = "Linking ";
|
||||
buildEcho += linkLanguage;
|
||||
buildEcho += " executable ";
|
||||
buildEcho += targetOutPath;
|
||||
this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
|
||||
cmLocalUnixMakefileGenerator3::EchoLink);
|
||||
cmLocalUnixMakefileGenerator3::EchoLink,
|
||||
&progress);
|
||||
}
|
||||
|
||||
// Build a list of compiler flags and linker flags.
|
||||
|
|
|
@ -341,8 +341,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
|
|||
this->Convert(targetFullPathImport,cmLocalGenerator::START_OUTPUT,
|
||||
cmLocalGenerator::SHELL);
|
||||
|
||||
this->NumberOfProgressActions++;
|
||||
if(!this->NoRuleMessages)
|
||||
{
|
||||
cmLocalUnixMakefileGenerator3::EchoProgress progress;
|
||||
this->MakeEchoProgress(progress);
|
||||
// Add the link message.
|
||||
std::string buildEcho = "Linking ";
|
||||
buildEcho += linkLanguage;
|
||||
|
@ -365,7 +368,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
|
|||
}
|
||||
buildEcho += targetOutPath.c_str();
|
||||
this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
|
||||
cmLocalUnixMakefileGenerator3::EchoLink);
|
||||
cmLocalUnixMakefileGenerator3::EchoLink,
|
||||
&progress);
|
||||
}
|
||||
|
||||
const char* forbiddenFlagVar = 0;
|
||||
|
|
Loading…
Reference in New Issue