[Cmake-commits] CMake branch, next, updated. v3.3.0-1421-g678e77c

[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  678e77c8af25bc70e80668dca1c097dd3a00e077 (commit)
       via  672e02aa72352fa82a725c9684ebf6d74ef7349d (commit)
      from  f00fb7f66f637f963529d4b717727921df85d904 (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=678e77c8af25bc70e80668dca1c097dd3a00e077
commit 678e77c8af25bc70e80668dca1c097dd3a00e077
Merge: f00fb7f 672e02a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 27 14:08:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 27 14:08:56 2015 -0400

    Merge topic 'use-generator-target' into next
    
    672e02aa fixup! cmCustomCommandGenerator: Require cmLocalGenerator in API.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=672e02aa72352fa82a725c9684ebf6d74ef7349d
commit 672e02aa72352fa82a725c9684ebf6d74ef7349d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 27 20:08:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jul 27 20:08:06 2015 +0200

    fixup! cmCustomCommandGenerator: Require cmLocalGenerator in API.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 61619ad..7f3b651 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -50,7 +50,8 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
     {
     return target->GetLocation(this->Config);
     }
-  return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(), this->Config);
+  return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(),
+                                          this->Config);
 }
 
 //----------------------------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake