From 95a27267daee021514df8c93ffd6d9b9e55dea51 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sat, 18 Apr 2015 14:50:37 +0200
Subject: cmMakefile: Extract conditional code to caller.

---
 Source/cmMakefile.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d3ea55a..bc225ff 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -525,6 +525,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
 bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
 {
   this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
+  this->cmCurrentListFile = listfile;
   return this->ReadListFile(listfile, 0, true,
                             this->cmStartDirectory == this->cmHomeDirectory);
 }
@@ -553,11 +554,6 @@ bool cmMakefile::ReadListFile(const char* filename_in,
     filenametoread = filename_in;
     }
 
-  if (!filenametoread.empty())
-    {
-    this->cmCurrentListFile = filenametoread;
-    }
-
   if (external_in)
     {
     filenametoread =
-- 
cgit v0.12