summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-14 22:09:53 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-19 20:36:49 (GMT)
commit2dd5d42f5254abda64009434f0b11a47ca16640e (patch)
treecaea3248fb241d5458677cb1b46766a82e578286 /Source
parentf3e6a336f29b0675e4eb3852ce7544f3c9342071 (diff)
downloadCMake-2dd5d42f5254abda64009434f0b11a47ca16640e.zip
CMake-2dd5d42f5254abda64009434f0b11a47ca16640e.tar.gz
CMake-2dd5d42f5254abda64009434f0b11a47ca16640e.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx10
-rw-r--r--Source/cmMakefile.h11
2 files changed, 11 insertions, 10 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e69c2ba..016425e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -610,12 +610,14 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
{
this->AddDefinition("CMAKE_PARENT_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 noPolicyScope,
bool requireProjectCommand)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 2a72cca..8c50e8e 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -84,12 +84,7 @@ public:
*/
~cmMakefile();
- /**
- * Read and parse a CMakeLists.txt file.
- */
- bool ReadListFile(const char* listfile,
- bool noPolicyScope = true,
- bool requireProjectCommand = false);
+ bool ReadListFile(const char* listfile);
bool ReadDependentFile(const char* listfile, bool noPolicyScope = true);
@@ -902,6 +897,10 @@ private:
cmState::Snapshot StateSnapshot;
+ bool ReadListFile(const char* listfile,
+ bool noPolicyScope,
+ bool requireProjectCommand);
+
bool ReadListFileInternal(const char* filenametoread,
bool noPolicyScope,
bool requireProjectCommand);