cmMakefile: Make the public ReadListFile method take one param.

Make the existing method a private overload. All external callers
invoke the method with only one argument.
This commit is contained in:
Stephen Kelly 2015-05-15 00:09:53 +02:00
parent f3e6a336f2
commit 2dd5d42f52
2 changed files with 11 additions and 10 deletions

View File

@ -610,12 +610,14 @@ bool cmMakefile::ReadDependentFile(const char* listfile, 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"));
return this->ReadListFile(listfile, noPolicyScope); return this->ReadListFile(listfile, noPolicyScope, false);
}
bool cmMakefile::ReadListFile(const char* listfile)
{
return this->ReadListFile(listfile, true, false);
} }
//----------------------------------------------------------------------------
// Parse the given CMakeLists.txt file executing all commands
//
bool cmMakefile::ReadListFile(const char* listfile, bool cmMakefile::ReadListFile(const char* listfile,
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand) bool requireProjectCommand)

View File

@ -84,12 +84,7 @@ public:
*/ */
~cmMakefile(); ~cmMakefile();
/** bool ReadListFile(const char* listfile);
* Read and parse a CMakeLists.txt file.
*/
bool ReadListFile(const char* listfile,
bool noPolicyScope = true,
bool requireProjectCommand = false);
bool ReadDependentFile(const char* listfile, bool noPolicyScope = true); bool ReadDependentFile(const char* listfile, bool noPolicyScope = true);
@ -902,6 +897,10 @@ private:
cmState::Snapshot StateSnapshot; cmState::Snapshot StateSnapshot;
bool ReadListFile(const char* listfile,
bool noPolicyScope,
bool requireProjectCommand);
bool ReadListFileInternal(const char* filenametoread, bool ReadListFileInternal(const char* filenametoread,
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand); bool requireProjectCommand);