[Cmake-commits] CMake branch, next, updated. v3.6.1-1543-g11a80af

[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  11a80af5b291997c173df0451fddfa3aaa4f4752 (commit)
       via  62f19fc531e2d3cc292005bcfaedc341966c01e9 (commit)
      from  a0d49a9213400b3bbb9f2505d09e47c3680a4680 (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=11a80af5b291997c173df0451fddfa3aaa4f4752
commit 11a80af5b291997c173df0451fddfa3aaa4f4752
Merge: a0d49a9 62f19fc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 09:16:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 27 09:16:39 2016 -0400

    Merge topic 'cleanup-Convert' into next
    
    62f19fc5 fixup! Makefiles: Replace method with Wacom specific API


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62f19fc531e2d3cc292005bcfaedc341966c01e9
commit 62f19fc531e2d3cc292005bcfaedc341966c01e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 15:16:15 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 27 15:16:15 2016 +0200

    fixup! Makefiles: Replace method with Wacom specific API

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 085cc91..2ef9a39 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -982,7 +982,8 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
                                         : cmOutputConverter::NONE);
       std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
       if (shellCommand.empty()) {
-        shellCommand = this->Convert(cmd, cmOutputConverter::NONE, cmOutputConverter::SHELL);
+        shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
+                                     cmOutputConverter::SHELL);
       }
       cmd = launcher + shellCommand;
 

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

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


hooks/post-receive
-- 
CMake