ENH: Add directory-level context information to error/warning messages when no call stack is present.

1 files changed, 15 insertions, 0 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f50cbf7..12ff1b6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -325,6 +325,21 @@ void cmMakefile::IssueMessage(std::string const& text, bool isError) const
       << ":" << lfc.Line << " " << lfc.Name;
     ++i;
     }
+  else if(!this->ListFileStack.empty())
+    {
+    // We are processing the project but are not currently executing a
+    // command.  Add whatever context information we have.
+    if(this->LocalGenerator->GetParent())
+      {
+      msg << " in directory "
+          << this->LocalGenerator->Convert(this->GetCurrentDirectory(),
+                                           cmLocalGenerator::HOME);
+      }
+    else
+      {
+      msg << " in top-level directory";
+      }
+    }
 
   // Add the message text.
   {