diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9a1f7ef4ba401b0198459df5f511538f11802b4d..08c5a0b1f3935f2ec2e9fa2b73e5fbc8e65b1435 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -576,12 +576,12 @@ bool cmMakefile::ReadListFile(const char* listfile, this->ListFileStack.push_back(filenametoread); - cmListFile cacheFile; - bool res = cacheFile.ParseFile(filenametoread.c_str(), - requireProjectCommand, this); + cmListFile listFile; + bool res = listFile.ParseFile(filenametoread.c_str(), + requireProjectCommand, this); if (res) { - this->ReadListFileInternal(cacheFile, filenametoread.c_str(), + this->ReadListFileInternal(listFile, filenametoread.c_str(), noPolicyScope); } @@ -601,7 +601,7 @@ bool cmMakefile::ReadListFile(const char* listfile, return res; } -void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile, +void cmMakefile::ReadListFileInternal(cmListFile const& listFile, const char* filenametoread, bool noPolicyScope) { @@ -614,11 +614,11 @@ void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile, IncludeScope incScope(this, filenametoread, noPolicyScope); // 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) { cmExecutionStatus status; - this->ExecuteCommand(cacheFile.Functions[i],status); + this->ExecuteCommand(listFile.Functions[i],status); if(cmSystemTools::GetFatalErrorOccured()) { // Exit early due to error. diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 5927be1e7940eb6127dc047c55971c552f05ae1d..b80a1eea8ade7d53259a6791880086b68fa27422 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -918,7 +918,7 @@ private: bool noPolicyScope, bool requireProjectCommand); - void ReadListFileInternal(cmListFile const& cacheFile, + void ReadListFileInternal(cmListFile const& listFile, const char* filenametoread, bool noPolicyScope);