From 0a34ea597a954f49335559108bf3fa3382734657 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 21 Jun 2015 23:19:50 +0200
Subject: [PATCH] cmMakefile: Compute the filename processed in a scope.

---
 Source/cmMakefile.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 32dd8f53c..3aaf8d0cf 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1658,10 +1658,13 @@ public:
 class cmMakefile::BuildsystemFileScope
 {
 public:
-  BuildsystemFileScope(cmMakefile* mf, std::string const& filename)
+  BuildsystemFileScope(cmMakefile* mf)
     : Makefile(mf), ReportError(true)
   {
-    this->Makefile->ListFileStack.push_back(filename);
+    std::string currentStart =
+        this->Makefile->StateSnapshot.GetCurrentSourceDirectory();
+    currentStart += "/CMakeLists.txt";
+    this->Makefile->ListFileStack.push_back(currentStart);
     this->Makefile->PushPolicyBarrier();
     this->Makefile->PushFunctionBlockerBarrier();
   }
@@ -1694,7 +1697,7 @@ void cmMakefile::Configure()
   this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str());
 
   {
-  BuildsystemFileScope scope(this, currentStart);
+  BuildsystemFileScope scope(this);
   cmListFile listFile;
   if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this))
     {