[Cmake-commits] CMake branch, next, updated. v3.2.1-1720-ge9afa5e

[Brad King]

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  e9afa5e5c5e62c7a7936aab438bb5afd4463461a (commit)
       via  2ed9d8d75b8ddd4e6115e243711e0c553a9a2650 (commit)
      from  5b7b3b57d97a831a27cc9f6dc2b5998a7780b6ca (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=e9afa5e5c5e62c7a7936aab438bb5afd4463461a
commit e9afa5e5c5e62c7a7936aab438bb5afd4463461a
Merge: 5b7b3b5 2ed9d8d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 14:20:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 14:20:49 2015 -0400

    Merge topic 'custom-command-multiple-outputs' into next
    
    2ed9d8d7 fixup! Makefile: Fix multiple custom command outputs with one missing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ed9d8d75b8ddd4e6115e243711e0c553a9a2650
commit 2ed9d8d75b8ddd4e6115e243711e0c553a9a2650
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 14:20:31 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 10 14:20:31 2015 -0400

    fixup! Makefile: Fix multiple custom command outputs with one missing

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 12b931a..ea11c79 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1315,8 +1315,6 @@ void cmMakefileTargetGenerator
 
   // Write the rule.
   const std::vector<std::string>& outputs = ccg.GetOutputs();
-  std::vector<std::string>::const_iterator o = outputs.begin();
-  {
   bool symbolic = this->WriteMakeRule(*this->BuildFileStream, 0,
                                       outputs, depends, commands);
 
@@ -1325,7 +1323,6 @@ void cmMakefileTargetGenerator
     {
     this->GlobalGenerator->AddRuleHash(ccg.GetOutputs(), content.str());
     }
-  }
 
   // Setup implicit dependency scanning.
   for(cmCustomCommand::ImplicitDependsList::const_iterator

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

Summary of changes:
 Source/cmMakefileTargetGenerator.cxx |    3 ---
 1 file changed, 3 deletions(-)


hooks/post-receive
-- 
CMake