[Cmake-commits] CMake branch, next, updated. v3.2.2-3130-g58fbdd8

[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  58fbdd85690249732f1e667ad82b6aab12076ac7 (commit)
       via  e40fcb598de8144a2824c7f30c754d3948231602 (commit)
      from  fe0e213632010d053bbe2ad4772ececc33fe5632 (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=58fbdd85690249732f1e667ad82b6aab12076ac7
commit 58fbdd85690249732f1e667ad82b6aab12076ac7
Merge: fe0e213 e40fcb5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 25 03:23:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 25 03:23:05 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    e40fcb59 cmMakefile: Simplify convert condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e40fcb598de8144a2824c7f30c754d3948231602
commit e40fcb598de8144a2824c7f30c754d3948231602
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 25 09:21:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 25 09:21:56 2015 +0200

    cmMakefile: Simplify convert condition.
    
    The CallStack is checked above.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3e8ae85..81960eb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -272,8 +272,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
       // command.  Add whatever context information we have.
       lfc.FilePath = this->ListFileStack.back();
       }
-    if(!this->CallStack.empty()
-       || !this->GetCMakeInstance()->GetIsInTryCompile())
+    if(!this->GetCMakeInstance()->GetIsInTryCompile())
       {
       lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath,
                                                    cmLocalGenerator::HOME);

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

Summary of changes:
 Source/cmMakefile.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake