[Cmake-commits] CMake branch, next, updated. v3.2.1-1836-ga4f0f6c

[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  a4f0f6ca892491e787e3259d5eba632196e2a4d6 (commit)
       via  7172add972038e6a9076cc1c752cacce9c00f256 (commit)
      from  c009d6847b4f82db1d85cdd88b67f664b83ed791 (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=a4f0f6ca892491e787e3259d5eba632196e2a4d6
commit a4f0f6ca892491e787e3259d5eba632196e2a4d6
Merge: c009d68 7172add
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 13 17:14:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 13 17:14:24 2015 -0400

    Merge topic 'port-global-properties-to-cmState' into next
    
    7172add9 fixup! Port cmCommand consumers to cmState.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7172add972038e6a9076cc1c752cacce9c00f256
commit 7172add972038e6a9076cc1c752cacce9c00f256
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 13 23:08:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 13 23:08:24 2015 +0200

    fixup! Port cmCommand consumers to cmState.

diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 6b8cfa0..0a71c60 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -481,8 +481,10 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
       // does a command exist
       if (this->IsKeyword("COMMAND", *arg) && argP1  != newArgs.end())
         {
+        cmCommand* command =
+            this->Makefile.GetState()->GetCommand(argP1->c_str());
         this->HandlePredicate(
-          this->Makefile.GetState()->GetCommand(argP1->c_str()),
+          command ? true : false,
           reducible, arg, newArgs, argP1, argP2);
         }
       // does a policy exist

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

Summary of changes:
 Source/cmConditionEvaluator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake