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

cmMakefile: Rename variables.

This commit is contained in:
Stephen Kelly 2015-06-21 19:38:02 +02:00
parent fe38bb2c29
commit a6e661b848
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefile.cxx
View File

@ -576,12 +576,12 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->ListFileStack.push_back(filenametoread); this->ListFileStack.push_back(filenametoread);
cmListFile cacheFile; cmListFile listFile;
bool res = cacheFile.ParseFile(filenametoread.c_str(), bool res = listFile.ParseFile(filenametoread.c_str(),
requireProjectCommand, this); requireProjectCommand, this);
if (res) if (res)
{ {
this->ReadListFileInternal(cacheFile, filenametoread.c_str(), this->ReadListFileInternal(listFile, filenametoread.c_str(),
noPolicyScope); noPolicyScope);
} }
@ -601,7 +601,7 @@ bool cmMakefile::ReadListFile(const char* listfile,
return res; return res;
} }
void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile, void cmMakefile::ReadListFileInternal(cmListFile const& listFile,
const char* filenametoread, const char* filenametoread,
bool noPolicyScope) bool noPolicyScope)
{ {
@ -614,11 +614,11 @@ void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile,
IncludeScope incScope(this, filenametoread, noPolicyScope); IncludeScope incScope(this, filenametoread, noPolicyScope);
// Run the parsed commands. // Run the parsed commands.
const size_t numberFunctions = cacheFile.Functions.size(); const size_t numberFunctions = listFile.Functions.size();
for(size_t i =0; i < numberFunctions; ++i) for(size_t i =0; i < numberFunctions; ++i)
{ {
cmExecutionStatus status; cmExecutionStatus status;
this->ExecuteCommand(cacheFile.Functions[i],status); this->ExecuteCommand(listFile.Functions[i],status);
if(cmSystemTools::GetFatalErrorOccured()) if(cmSystemTools::GetFatalErrorOccured())
{ {
// Exit early due to error. // Exit early due to error.

2
Source/cmMakefile.h
View File

@ -918,7 +918,7 @@ private:
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand); bool requireProjectCommand);
void ReadListFileInternal(cmListFile const& cacheFile, void ReadListFileInternal(cmListFile const& listFile,
const char* filenametoread, const char* filenametoread,
bool noPolicyScope); bool noPolicyScope);