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

Merge topic 'rule-messages' 

dca304e Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
051cee0 Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
This commit is contained in:
Brad King 2011-05-24 14:34:33 -04:00 committed by CMake Topic Stage
parent 7ffb678e4b dca304ec8d
commit da1b688325
2 changed files with 73 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -24,7 +24,6 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
this->ForceUnixPaths = true; this->ForceUnixPaths = true;
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake"; this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = true; this->ToolSupportsColor = true;
this->NoRuleMessages = false;
#if defined(_WIN32) || defined(__VMS) #if defined(_WIN32) || defined(__VMS)
this->UseLinkScript = false; this->UseLinkScript = false;
@ -144,14 +143,6 @@ void cmGlobalUnixMakefileGenerator3::Generate()
// first do superclass method // first do superclass method
this->cmGlobalGenerator::Generate(); this->cmGlobalGenerator::Generate();
cmake* cm = this->GetCMakeInstance();
if(const char* ruleStatus = cm->GetProperty("RULE_MESSAGES"))
{
this->NoRuleMessages = cmSystemTools::IsOff(ruleStatus);
}
if(!this->NoRuleMessages)
{
// initialize progress // initialize progress
unsigned long total = 0; unsigned long total = 0;
for(ProgressMapType::const_iterator pmi = this->ProgressMap.begin(); for(ProgressMapType::const_iterator pmi = this->ProgressMap.begin();
@ -184,7 +175,6 @@ void cmGlobalUnixMakefileGenerator3::Generate()
cmGeneratedFileStream markFile(markFileName.c_str()); cmGeneratedFileStream markFile(markFileName.c_str());
markFile << this->CountProgressMarksInAll(lg) << "\n"; markFile << this->CountProgressMarksInAll(lg) << "\n";
} }
}
// write the main makefile // write the main makefile
this->WriteMainMakefile2(); this->WriteMainMakefile2();
@ -747,11 +737,8 @@ cmGlobalUnixMakefileGenerator3
// Write the rule. // Write the rule.
localName += "/all"; localName += "/all";
depends.clear(); depends.clear();
std::string progressDir;
if(!this->NoRuleMessages) std::string progressDir =
{
progressDir =
lg->GetMakefile()->GetHomeOutputDirectory(); lg->GetMakefile()->GetHomeOutputDirectory();
progressDir += cmake::GetCMakeFilesDirectory(); progressDir += cmake::GetCMakeFilesDirectory();
{ {
@ -774,7 +761,6 @@ cmGlobalUnixMakefileGenerator3
progressDir = "Built target "; progressDir = "Built target ";
progressDir += t->first; progressDir += t->first;
lg->AppendEcho(commands,progressDir.c_str()); lg->AppendEcho(commands,progressDir.c_str());
}
this->AppendGlobalTargetDepends(depends,t->second); this->AppendGlobalTargetDepends(depends,t->second);
lg->WriteMakeRule(ruleFileStream, "All Build rule for target.", lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
@ -790,8 +776,6 @@ cmGlobalUnixMakefileGenerator3
"all", depends, commands, true); "all", depends, commands, true);
} }
if(!this->NoRuleMessages)
{
// Write the rule. // Write the rule.
commands.clear(); commands.clear();
progressDir = lg->GetMakefile()->GetHomeOutputDirectory(); progressDir = lg->GetMakefile()->GetHomeOutputDirectory();
@ -811,12 +795,10 @@ cmGlobalUnixMakefileGenerator3
<< this->CountProgressMarksInTarget(&t->second, emitted); << this->CountProgressMarksInTarget(&t->second, emitted);
commands.push_back(progCmd.str()); commands.push_back(progCmd.str());
} }
}
std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash(); std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash();
tmp += "Makefile2"; tmp += "Makefile2";
commands.push_back(lg->GetRecursiveMakeCall commands.push_back(lg->GetRecursiveMakeCall
(tmp.c_str(),localName.c_str())); (tmp.c_str(),localName.c_str()));
if(!this->NoRuleMessages)
{ {
cmOStringStream progCmd; cmOStringStream progCmd;
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0 progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0

2
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -159,8 +159,6 @@ protected:
// in the rule to satisfy the make program. // in the rule to satisfy the make program.
std::string EmptyRuleHackCommand; std::string EmptyRuleHackCommand;
bool NoRuleMessages;
// Store per-target progress counters. // Store per-target progress counters.
struct TargetProgress struct TargetProgress
{ {