[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-481-g1bb21a3

[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  1bb21a3db2a9f21519af13ce8f80c045334bae63 (commit)
       via  02f6ee3a5534016a16089e0572efedbb179f1e08 (commit)
      from  051c84ff36515a494787acbd8f8c8197c9326413 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bb21a3db2a9f21519af13ce8f80c045334bae63
commit 1bb21a3db2a9f21519af13ce8f80c045334bae63
Merge: 051c84f 02f6ee3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 15:44:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:44:29 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    02f6ee3a fix style


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02f6ee3a5534016a16089e0572efedbb179f1e08
commit 02f6ee3a5534016a16089e0572efedbb179f1e08
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 21:44:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:44:06 2015 +0200

    fix style

diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 9fc7336..db65db1 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -56,7 +56,8 @@ struct cmGeneratorExpressionNode
   static std::string EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    const cmGeneratorTarget* headTarget, const cmGeneratorTarget* currentTarget,
+    const cmGeneratorTarget* headTarget,
+    const cmGeneratorTarget* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
 
   static const cmGeneratorExpressionNode* GetNode(

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

Summary of changes:
 Source/cmGeneratorExpressionNode.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake