[Cmake-commits] CMake branch, next, updated. v3.2.2-3132-g77c60a3

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  77c60a3ed4aac2760f99236c1fff4b5b3b718aa9 (commit)
       via  f5b0a0fba458077e0531586f07ed2d01fb7f6259 (commit)
      from  58fbdd85690249732f1e667ad82b6aab12076ac7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77c60a3ed4aac2760f99236c1fff4b5b3b718aa9
commit 77c60a3ed4aac2760f99236c1fff4b5b3b718aa9
Merge: 58fbdd8 f5b0a0f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 25 04:12:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 25 04:12:02 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    f5b0a0fb cmMakefile: Don't pop the directory listfile off the stack.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5b0a0fba458077e0531586f07ed2d01fb7f6259
commit f5b0a0fba458077e0531586f07ed2d01fb7f6259
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 11:06:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 25 09:49:59 2015 +0200

    cmMakefile: Don't pop the directory listfile off the stack.
    
    Simplify the IssueMessage implementation.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 81960eb..71a8b6d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -260,18 +260,10 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
   else
     {
     cmListFileContext lfc;
-    if(this->ListFileStack.empty())
-      {
-      // We are not processing the project.  Add the directory-level context.
-      lfc.FilePath = this->GetCurrentSourceDirectory();
-      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();
-      }
+    // We are not currently executing a command.  Add whatever context
+    // information we have.
+    lfc.FilePath = this->ListFileStack.back();
+
     if(!this->GetCMakeInstance()->GetIsInTryCompile())
       {
       lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath,
@@ -535,12 +527,16 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
 {
   this->AddDefinition("CMAKE_PARENT_LIST_FILE",
                       this->GetDefinition("CMAKE_CURRENT_LIST_FILE"));
-  return this->ReadListFile(listfile, noPolicyScope, false);
+  bool result = this->ReadListFile(listfile, noPolicyScope, false);
+  this->ListFileStack.pop_back();
+  return result;
 }
 
 bool cmMakefile::ReadListFile(const char* listfile)
 {
-  return this->ReadListFile(listfile, true, false);
+  bool result = this->ReadListFile(listfile, true, false);
+  this->ListFileStack.pop_back();
+  return result;
 }
 
 bool cmMakefile::ReadListFile(const char* listfile,
@@ -577,8 +573,6 @@ bool cmMakefile::ReadListFile(const char* listfile,
   this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
   this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
 
-  this->ListFileStack.pop_back();
-
   if (res)
     {
     this->CheckForUnusedVariables();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake