[Cmake-commits] CMake branch, next, updated. v2.8.4-1540-g32f8140
Brad King
brad.king at kitware.com
Mon May 16 11:30:17 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 32f8140a535b0c11aebf6fbc60fdefe75988ddc1 (commit)
via dca304ec8d17abd0ec8a0d2ef1bd807c35423df6 (commit)
via 051cee0096df31d8808549f6200745180f3cc191 (commit)
from 024f2cdceaa3a65a176c9b1056c799b7fa9ffbdc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32f8140a535b0c11aebf6fbc60fdefe75988ddc1
commit 32f8140a535b0c11aebf6fbc60fdefe75988ddc1
Merge: 024f2cd dca304e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 11:30:14 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 11:30:14 2011 -0400
Merge topic 'rule-messages' into next
dca304e Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
051cee0 Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dca304ec8d17abd0ec8a0d2ef1bd807c35423df6
commit dca304ec8d17abd0ec8a0d2ef1bd807c35423df6
Merge: 051cee0 156ae39
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 11:28:07 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 16 11:28:07 2011 -0400
Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
Conflicts:
Source/cmGlobalUnixMakefileGenerator3.cxx
Source/cmGlobalUnixMakefileGenerator3.h
diff --cc Source/cmGlobalUnixMakefileGenerator3.cxx
index 5a3eb02,d9a341c..55ff87e
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@@ -24,7 -24,7 +24,6 @@@ cmGlobalUnixMakefileGenerator3::cmGloba
this->ForceUnixPaths = true;
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = true;
- this->ForceVerboseMakefiles = false;
- this->NoRuleMessages = false;
#if defined(_WIN32) || defined(__VMS)
this->UseLinkScript = false;
diff --cc Source/cmGlobalUnixMakefileGenerator3.h
index f499536,cdc9460..11174d7
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@@ -169,8 -159,8 +159,6 @@@ protected
// in the rule to satisfy the make program.
std::string EmptyRuleHackCommand;
- bool ForceVerboseMakefiles;
-
- bool NoRuleMessages;
-
// Store per-target progress counters.
struct TargetProgress
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=051cee0096df31d8808549f6200745180f3cc191
commit 051cee0096df31d8808549f6200745180f3cc191
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 11:18:39 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 16 11:26:58 2011 -0400
Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
This reverts commit dc36b3499403bad323d7300139fbf459c31f7a2c. It broke
dependency logic instead of only silencing messages. Revert to previous
behavior.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 08eb391..5a3eb02 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -25,7 +25,6 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = true;
this->ForceVerboseMakefiles = false;
- this->NoRuleMessages = false;
#if defined(_WIN32) || defined(__VMS)
this->UseLinkScript = false;
@@ -145,46 +144,37 @@ void cmGlobalUnixMakefileGenerator3::Generate()
// first do superclass method
this->cmGlobalGenerator::Generate();
- cmake* cm = this->GetCMakeInstance();
- if(const char* ruleStatus = cm->GetProperty("RULE_MESSAGES"))
+ // initialize progress
+ unsigned long total = 0;
+ for(ProgressMapType::const_iterator pmi = this->ProgressMap.begin();
+ pmi != this->ProgressMap.end(); ++pmi)
{
- this->NoRuleMessages = cmSystemTools::IsOff(ruleStatus);
+ total += pmi->second.NumberOfActions;
}
- if(!this->NoRuleMessages)
+ // write each target's progress.make this loop is done twice. Bascially the
+ // Generate pass counts all the actions, the first loop below determines
+ // how many actions have progress updates for each target and writes to
+ // corrrect variable values for everything except the all targets. The
+ // second loop actually writes out correct values for the all targets as
+ // well. This is because the all targets require more information that is
+ // computed in the first loop.
+ unsigned long current = 0;
+ for(ProgressMapType::iterator pmi = this->ProgressMap.begin();
+ pmi != this->ProgressMap.end(); ++pmi)
{
- // initialize progress
- unsigned long total = 0;
- for(ProgressMapType::const_iterator pmi = this->ProgressMap.begin();
- pmi != this->ProgressMap.end(); ++pmi)
- {
- total += pmi->second.NumberOfActions;
- }
-
- // write each target's progress.make this loop is done twice. Bascially the
- // Generate pass counts all the actions, the first loop below determines
- // how many actions have progress updates for each target and writes to
- // corrrect variable values for everything except the all targets. The
- // second loop actually writes out correct values for the all targets as
- // well. This is because the all targets require more information that is
- // computed in the first loop.
- unsigned long current = 0;
- for(ProgressMapType::iterator pmi = this->ProgressMap.begin();
- pmi != this->ProgressMap.end(); ++pmi)
- {
- pmi->second.WriteProgressVariables(total, current);
- }
- for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
- {
- cmLocalUnixMakefileGenerator3 *lg =
- static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
- std::string markFileName = lg->GetMakefile()->GetStartOutputDirectory();
- markFileName += "/";
- markFileName += cmake::GetCMakeFilesDirectory();
- markFileName += "/progress.marks";
- cmGeneratedFileStream markFile(markFileName.c_str());
- markFile << this->CountProgressMarksInAll(lg) << "\n";
- }
+ pmi->second.WriteProgressVariables(total, current);
+ }
+ for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+ {
+ cmLocalUnixMakefileGenerator3 *lg =
+ static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
+ std::string markFileName = lg->GetMakefile()->GetStartOutputDirectory();
+ markFileName += "/";
+ markFileName += cmake::GetCMakeFilesDirectory();
+ markFileName += "/progress.marks";
+ cmGeneratedFileStream markFile(markFileName.c_str());
+ markFile << this->CountProgressMarksInAll(lg) << "\n";
}
// write the main makefile
@@ -748,34 +738,30 @@ cmGlobalUnixMakefileGenerator3
// Write the rule.
localName += "/all";
depends.clear();
- std::string progressDir;
- if(!this->NoRuleMessages)
+ std::string progressDir =
+ lg->GetMakefile()->GetHomeOutputDirectory();
+ progressDir += cmake::GetCMakeFilesDirectory();
{
- progressDir =
- lg->GetMakefile()->GetHomeOutputDirectory();
- progressDir += cmake::GetCMakeFilesDirectory();
+ cmOStringStream progCmd;
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
+ // all target counts
+ progCmd << lg->Convert(progressDir.c_str(),
+ cmLocalGenerator::FULL,
+ cmLocalGenerator::SHELL);
+ progCmd << " ";
+ std::vector<unsigned long>& progFiles =
+ this->ProgressMap[&t->second].Marks;
+ for (std::vector<unsigned long>::iterator i = progFiles.begin();
+ i != progFiles.end(); ++i)
{
- cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
- // all target counts
- progCmd << lg->Convert(progressDir.c_str(),
- cmLocalGenerator::FULL,
- cmLocalGenerator::SHELL);
- progCmd << " ";
- std::vector<unsigned long>& progFiles =
- this->ProgressMap[&t->second].Marks;
- for (std::vector<unsigned long>::iterator i = progFiles.begin();
- i != progFiles.end(); ++i)
- {
- progCmd << " " << *i;
- }
- commands.push_back(progCmd.str());
+ progCmd << " " << *i;
}
- progressDir = "Built target ";
- progressDir += t->first;
- lg->AppendEcho(commands,progressDir.c_str());
+ commands.push_back(progCmd.str());
}
+ progressDir = "Built target ";
+ progressDir += t->first;
+ lg->AppendEcho(commands,progressDir.c_str());
this->AppendGlobalTargetDepends(depends,t->second);
lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
@@ -791,42 +777,38 @@ cmGlobalUnixMakefileGenerator3
"all", depends, commands, true);
}
- if(!this->NoRuleMessages)
- {
- // Write the rule.
- commands.clear();
- progressDir = lg->GetMakefile()->GetHomeOutputDirectory();
- progressDir += cmake::GetCMakeFilesDirectory();
+ // Write the rule.
+ commands.clear();
+ progressDir = lg->GetMakefile()->GetHomeOutputDirectory();
+ progressDir += cmake::GetCMakeFilesDirectory();
- {
- // TODO: Convert the total progress count to a make variable.
- cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
- // # in target
- progCmd << lg->Convert(progressDir.c_str(),
- cmLocalGenerator::FULL,
- cmLocalGenerator::SHELL);
- //
- std::set<cmTarget *> emitted;
- progCmd << " "
- << this->CountProgressMarksInTarget(&t->second, emitted);
- commands.push_back(progCmd.str());
- }
- }
+ {
+ // TODO: Convert the total progress count to a make variable.
+ cmOStringStream progCmd;
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
+ // # in target
+ progCmd << lg->Convert(progressDir.c_str(),
+ cmLocalGenerator::FULL,
+ cmLocalGenerator::SHELL);
+ //
+ std::set<cmTarget *> emitted;
+ progCmd << " "
+ << this->CountProgressMarksInTarget(&t->second, emitted);
+ commands.push_back(progCmd.str());
+ }
std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash();
tmp += "Makefile2";
commands.push_back(lg->GetRecursiveMakeCall
(tmp.c_str(),localName.c_str()));
- if(!this->NoRuleMessages)
- {
- cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
- progCmd << lg->Convert(progressDir.c_str(),
- cmLocalGenerator::FULL,
- cmLocalGenerator::SHELL);
- progCmd << " 0";
- commands.push_back(progCmd.str());
- }
+ {
+ cmOStringStream progCmd;
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
+ progCmd << lg->Convert(progressDir.c_str(),
+ cmLocalGenerator::FULL,
+ cmLocalGenerator::SHELL);
+ progCmd << " 0";
+ commands.push_back(progCmd.str());
+ }
depends.clear();
depends.push_back("cmake_check_build_system");
localName = lg->GetRelativeTargetDirectory(t->second);
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 01f5fac..f499536 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -170,7 +170,6 @@ protected:
std::string EmptyRuleHackCommand;
bool ForceVerboseMakefiles;
- bool NoRuleMessages;
// Store per-target progress counters.
struct TargetProgress
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalUnixMakefileGenerator3.cxx | 164 +++++++++++++----------------
Source/cmGlobalUnixMakefileGenerator3.h | 2 -
2 files changed, 73 insertions(+), 93 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list