[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.453 1.454

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9344/Source

Modified Files:
	cmMakefile.cxx 
Log Message:
ENH: Add directory-level context information to error/warning messages when no call stack is present.


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.453
retrieving revision 1.454
diff -C 2 -d -r1.453 -r1.454
*** cmMakefile.cxx	8 Mar 2008 14:21:30 -0000	1.453
--- cmMakefile.cxx	10 Mar 2008 19:40:57 -0000	1.454
***************
*** 326,329 ****
--- 326,344 ----
      ++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.