[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.466 1.467

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefile.cxx 
Log Message:
ENH: In cmMakefile::IssueMessage report the directory-level context even if no list file is currently being processed.


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.466
retrieving revision 1.467
diff -C 2 -d -r1.466 -r1.467
*** cmMakefile.cxx	31 Mar 2008 17:33:09 -0000	1.466
--- cmMakefile.cxx	29 Apr 2008 18:17:28 -0000	1.467
***************
*** 300,309 ****
      this->GetBacktrace(backtrace);
      }
!   else if(!this->ListFileStack.empty())
      {
-     // We are processing the project but are not currently executing a
-     // command.  Add whatever context information we have.
      cmListFileContext lfc;
!     lfc.FilePath = this->ListFileStack.back();
      lfc.Line = 0;
      if(!this->GetCMakeInstance()->GetIsInTryCompile())
--- 300,318 ----
      this->GetBacktrace(backtrace);
      }
!   else
      {
      cmListFileContext lfc;
!     if(this->ListFileStack.empty())
!       {
!       // We are not processing the project.  Add the directory-level context.
!       lfc.FilePath = this->GetCurrentDirectory();
!       lfc.FilePath += "/CMakeLists.txt";
!       }
!     else
!       {
!       // We are processing the project but are not currently executing a
!       // command.  Add whatever context information we have.
!       lfc.FilePath = this->ListFileStack.back();
!       }
      lfc.Line = 0;
      if(!this->GetCMakeInstance()->GetIsInTryCompile())