From 276c62253e3f25eda4acbf0049a70c7d622c9ea2 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 21 Jun 2015 22:46:42 +0200
Subject: cmMakefile: Move the IncludeScope to where it is used.

---
 Source/cmMakefile.cxx | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a3ba134..5225605 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -405,6 +405,26 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
   return result;
 }
 
+bool cmMakefile::ProcessBuildsystemFile(const char* filename)
+{
+  this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename);
+  std::string curSrc = this->GetCurrentSourceDirectory();
+
+  this->ListFileStack.push_back(filename);
+
+  cmListFile listFile;
+  if (!listFile.ParseFile(filename, curSrc == this->GetHomeDirectory(), this))
+    {
+    return false;
+    }
+
+  this->PushPolicyBarrier();
+  this->ReadListFile(listFile, filename);
+  this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
+  this->EnforceDirectoryLevelRules();
+  return true;
+}
+
 //----------------------------------------------------------------------------
 class cmMakefile::IncludeScope
 {
@@ -532,26 +552,6 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
     }
 }
 
-bool cmMakefile::ProcessBuildsystemFile(const char* filename)
-{
-  this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename);
-  std::string curSrc = this->GetCurrentSourceDirectory();
-
-  this->ListFileStack.push_back(filename);
-
-  cmListFile listFile;
-  if (!listFile.ParseFile(filename, curSrc == this->GetHomeDirectory(), this))
-    {
-    return false;
-    }
-
-  this->PushPolicyBarrier();
-  this->ReadListFile(listFile, filename);
-  this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
-  this->EnforceDirectoryLevelRules();
-  return true;
-}
-
 bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope)
 {
   this->AddDefinition("CMAKE_PARENT_LIST_FILE",
-- 
cgit v0.12