mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: Clarify name of internal list file run method

Browse Source
This commit is contained in:
Brad King
2020-09-21 14:05:28 -04:00
parent 39677de5e2
commit 1a5bf8245e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefile.cxx
View File

@@ -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();
}

4
Source/cmMakefile.h
View File

@@ -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);