summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-02-29 07:49:42 (GMT)
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-02-29 07:49:42 (GMT)
commit89403bf87f21d9bccb9c73afb5df914cb88ec9ee (patch)
tree8024d4dc0815f868f27dd3d7919f129fa3309691 /Source
parent26519d591ea28d3f26f34c625c2d57db6f302d63 (diff)
downloadCMake-89403bf87f21d9bccb9c73afb5df914cb88ec9ee.zip
CMake-89403bf87f21d9bccb9c73afb5df914cb88ec9ee.tar.gz
CMake-89403bf87f21d9bccb9c73afb5df914cb88ec9ee.tar.bz2
Rename UsedCommands to FinalPassCommands
When I read 'UsedCommands' I thought that it holds all commands used in the file, not only those that have FinalPass().
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx10
-rw-r--r--Source/cmMakefile.h8
2 files changed, 6 insertions, 12 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fdf5b31..a715f06 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -210,9 +210,9 @@ cmMakefile::~cmMakefile()
{
delete *i;
}
- for(unsigned int i=0; i < this->UsedCommands.size(); i++)
+ for(unsigned int i=0; i < this->FinalPassCommands.size(); i++)
{
- delete this->UsedCommands[i];
+ delete this->FinalPassCommands[i];
}
std::vector<cmFunctionBlocker*>::iterator pos;
for (pos = this->FunctionBlockers.begin();
@@ -421,7 +421,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
else if(pcmd->HasFinalPass())
{
// use the command
- this->UsedCommands.push_back(pcmd.release());
+ this->FinalPassCommands.push_back(pcmd.release());
}
}
else if ( this->GetCMakeInstance()->GetWorkingMode() == cmake::SCRIPT_MODE
@@ -813,8 +813,8 @@ void cmMakefile::FinalPass()
// give all the commands a chance to do something
// after the file has been parsed before generation
- for(std::vector<cmCommand*>::iterator i = this->UsedCommands.begin();
- i != this->UsedCommands.end(); ++i)
+ for(std::vector<cmCommand*>::iterator i = this->FinalPassCommands.begin();
+ i != this->FinalPassCommands.end(); ++i)
{
(*i)->FinalPass();
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 1c46a73..f1f318a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -620,12 +620,6 @@ public:
*/
bool CanIWriteThisFile(const char* fileName);
- /**
- * Get the vector of used command instances.
- */
- const std::vector<cmCommand*>& GetUsedCommands() const
- {return this->UsedCommands;}
-
#if defined(CMAKE_BUILD_WITH_CMAKE)
/**
* Get the vector source groups.
@@ -913,7 +907,7 @@ protected:
std::vector<cmSourceGroup> SourceGroups;
#endif
- std::vector<cmCommand*> UsedCommands;
+ std::vector<cmCommand*> FinalPassCommands;
cmLocalGenerator* LocalGenerator;
bool IsFunctionBlocked(const cmListFileFunction& lff,
cmExecutionStatus &status);