summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-21 18:02:16 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-21 18:10:51 (GMT)
commita1858136c28326212d15cfd0a4412281f46b9cb0 (patch)
tree89dddc711067bdd9a84a99eb0d73a35bf2ca6dc9
parentad47e6e5bc4822dc5bc9d82ae1d7590aee4ece95 (diff)
downloadCMake-a1858136c28326212d15cfd0a4412281f46b9cb0.zip
CMake-a1858136c28326212d15cfd0a4412281f46b9cb0.tar.gz
CMake-a1858136c28326212d15cfd0a4412281f46b9cb0.tar.bz2
cmMakefile: Rename parameter.
-rw-r--r--Source/cmMakefile.cxx18
-rw-r--r--Source/cmMakefile.h8
2 files changed, 13 insertions, 13 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c4400d1..62d4c66 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -529,24 +529,24 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
}
}
-bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
+bool cmMakefile::ProcessBuildsystemFile(const char* filename)
{
- this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
+ this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename);
std::string curSrc = this->GetCurrentSourceDirectory();
this->PushPolicyBarrier();
- bool result = this->ReadListFile(listfile,
+ bool result = this->ReadListFile(filename,
curSrc == this->GetHomeDirectory());
this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
this->EnforceDirectoryLevelRules();
return result;
}
-bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
+bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope)
{
this->AddDefinition("CMAKE_PARENT_LIST_FILE",
this->GetDefinition("CMAKE_CURRENT_LIST_FILE"));
IncludeScope incScope(this, noPolicyScope);
- bool result = this->ReadListFile(listfile, false);
+ bool result = this->ReadListFile(filename, false);
if(cmSystemTools::GetFatalErrorOccured())
{
incScope.Quiet();
@@ -554,20 +554,20 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
return result;
}
-bool cmMakefile::ReadListFile(const char* listfile)
+bool cmMakefile::ReadListFile(const char* filename)
{
this->PushPolicyBarrier();
- bool result = this->ReadListFile(listfile, false);
+ bool result = this->ReadListFile(filename, false);
this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
this->ListFileStack.pop_back();
return result;
}
-bool cmMakefile::ReadListFile(const char* listfile,
+bool cmMakefile::ReadListFile(const char* filename,
bool requireProjectCommand)
{
std::string filenametoread =
- cmSystemTools::CollapseFullPath(listfile,
+ cmSystemTools::CollapseFullPath(filename,
this->GetCurrentSourceDirectory());
this->ListFileStack.push_back(filenametoread);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8ea6e13..24b4bd0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -79,11 +79,11 @@ public:
*/
~cmMakefile();
- bool ReadListFile(const char* listfile);
+ bool ReadListFile(const char* filename);
- bool ReadDependentFile(const char* listfile, bool noPolicyScope = true);
+ bool ReadDependentFile(const char* filename, bool noPolicyScope = true);
- bool ProcessBuildsystemFile(const char* listfile);
+ bool ProcessBuildsystemFile(const char* filename);
/**
* Add a function blocker to this makefile
@@ -914,7 +914,7 @@ private:
cmState::Snapshot StateSnapshot;
- bool ReadListFile(const char* listfile,
+ bool ReadListFile(const char* filename,
bool requireProjectCommand);
bool ParseDefineFlag(std::string const& definition, bool remove);