Commit a1858136 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmMakefile: Rename parameter.

parent ad47e6e5
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment