diff options
| -rw-r--r-- | Source/cmMakefile.cxx | 12 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c8b2133..896839b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -622,7 +622,7 @@ bool cmMakefile::ReadDependentFile(const std::string& filename, return false; } - this->ReadListFile(listFile, filenametoread); + this->RunListFile(listFile, filenametoread); if (cmSystemTools::GetFatalErrorOccured()) { incScope.Quiet(); } @@ -676,7 +676,7 @@ bool cmMakefile::ReadListFile(const std::string& filename) return false; } - this->ReadListFile(listFile, filenametoread); + this->RunListFile(listFile, filenametoread); if (cmSystemTools::GetFatalErrorOccured()) { scope.Quiet(); } @@ -697,15 +697,15 @@ bool cmMakefile::ReadListFileAsString(const std::string& content, return false; } - this->ReadListFile(listFile, filenametoread); + this->RunListFile(listFile, filenametoread); if (cmSystemTools::GetFatalErrorOccured()) { scope.Quiet(); } return true; } -void cmMakefile::ReadListFile(cmListFile const& listFile, - std::string const& filenametoread) +void cmMakefile::RunListFile(cmListFile const& listFile, + std::string const& filenametoread) { // add this list file to the list of dependencies this->ListFiles.push_back(filenametoread); @@ -1678,7 +1678,7 @@ void cmMakefile::Configure() } } - this->ReadListFile(listFile, currentStart); + this->RunListFile(listFile, currentStart); if (cmSystemTools::GetFatalErrorOccured()) { scope.Quiet(); } diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 7c3348d..d851dd6 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -1028,8 +1028,8 @@ private: void DoGenerate(cmLocalGenerator& lg); - void ReadListFile(cmListFile const& listFile, - const std::string& filenametoread); + void RunListFile(cmListFile const& listFile, + const std::string& filenametoread); bool ParseDefineFlag(std::string const& definition, bool remove); |