summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-18 12:50:32 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-18 13:29:17 (GMT)
commit0d9555779d7bd2a8d068f5b9af431bcf9673453a (patch)
tree99b8d63b6a60cbda6e957acc1d6842b31ac5ad23 /Source
parent846608f2678b4bced696857b5ca45e11bc86aa2c (diff)
downloadCMake-0d9555779d7bd2a8d068f5b9af431bcf9673453a.zip
CMake-0d9555779d7bd2a8d068f5b9af431bcf9673453a.tar.gz
CMake-0d9555779d7bd2a8d068f5b9af431bcf9673453a.tar.bz2
cmMakefile: Delegate ListFile reading to internal method.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx9
-rw-r--r--Source/cmMakefile.h6
2 files changed, 15 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2b4b896..0211591 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -542,6 +542,15 @@ bool cmMakefile::ReadListFile(const char* filename_in,
bool noPolicyScope,
bool requireProjectCommand)
{
+ return this->ReadListFileInternal(filename_in, external_in,
+ noPolicyScope, requireProjectCommand);
+}
+
+bool cmMakefile::ReadListFileInternal(const char* filename_in,
+ const char* external_in,
+ bool noPolicyScope,
+ bool requireProjectCommand)
+{
std::string currentParentFile
= this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");
std::string currentFile
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3d925fa..88faed9 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -991,6 +991,12 @@ protected:
private:
void Initialize();
+
+ bool ReadListFileInternal(const char* filename_in,
+ const char* external_in,
+ bool noPolicyScope,
+ bool requireProjectCommand);
+
bool ParseDefineFlag(std::string const& definition, bool remove);
bool EnforceUniqueDir(const std::string& srcPath,