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

cmMakefile: Rename parameter.

This commit is contained in:
Stephen Kelly 2015-06-21 20:02:16 +02:00
parent ad47e6e5bc
commit a1858136c2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmMakefile.cxx
View File

@ -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(); std::string curSrc = this->GetCurrentSourceDirectory();
this->PushPolicyBarrier(); this->PushPolicyBarrier();
bool result = this->ReadListFile(listfile, bool result = this->ReadListFile(filename,
curSrc == this->GetHomeDirectory()); curSrc == this->GetHomeDirectory());
this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured()); this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
this->EnforceDirectoryLevelRules(); this->EnforceDirectoryLevelRules();
return result; 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->AddDefinition("CMAKE_PARENT_LIST_FILE",
this->GetDefinition("CMAKE_CURRENT_LIST_FILE")); this->GetDefinition("CMAKE_CURRENT_LIST_FILE"));
IncludeScope incScope(this, noPolicyScope); IncludeScope incScope(this, noPolicyScope);
bool result = this->ReadListFile(listfile, false); bool result = this->ReadListFile(filename, false);
if(cmSystemTools::GetFatalErrorOccured()) if(cmSystemTools::GetFatalErrorOccured())
{ {
incScope.Quiet(); incScope.Quiet();
@ -554,20 +554,20 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
return result; return result;
} }
bool cmMakefile::ReadListFile(const char* listfile) bool cmMakefile::ReadListFile(const char* filename)
{ {
this->PushPolicyBarrier(); this->PushPolicyBarrier();
bool result = this->ReadListFile(listfile, false); bool result = this->ReadListFile(filename, false);
this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured()); this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
this->ListFileStack.pop_back(); this->ListFileStack.pop_back();
return result; return result;
} }
bool cmMakefile::ReadListFile(const char* listfile, bool cmMakefile::ReadListFile(const char* filename,
bool requireProjectCommand) bool requireProjectCommand)
{ {
std::string filenametoread = std::string filenametoread =
cmSystemTools::CollapseFullPath(listfile, cmSystemTools::CollapseFullPath(filename,
this->GetCurrentSourceDirectory()); this->GetCurrentSourceDirectory());
this->ListFileStack.push_back(filenametoread); this->ListFileStack.push_back(filenametoread);

8
Source/cmMakefile.h
View File

@ -79,11 +79,11 @@ public:
*/ */
~cmMakefile(); ~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 * Add a function blocker to this makefile
@ -914,7 +914,7 @@ private:
cmState::Snapshot StateSnapshot; cmState::Snapshot StateSnapshot;
bool ReadListFile(const char* listfile, bool ReadListFile(const char* filename,
bool requireProjectCommand); bool requireProjectCommand);
bool ParseDefineFlag(std::string const& definition, bool remove); bool ParseDefineFlag(std::string const& definition, bool remove);