[Cmake-commits] CMake branch, next, updated. v3.6.1-1539-g4812110

[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  4812110823f42f84573a23c87459afa91349995f (commit)
       via  dc0edf29b65c50d25da84ecca0c48131f5da69c0 (commit)
      from  978941f83ab3e4bd80ac52100a13c68a85bb8ce0 (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=4812110823f42f84573a23c87459afa91349995f
commit 4812110823f42f84573a23c87459afa91349995f
Merge: 978941f dc0edf2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 09:14:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 27 09:14:16 2016 -0400

    Merge topic 'cleanup-Convert' into next
    
    dc0edf29 Fixup commit


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

    Fixup commit

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

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

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


hooks/post-receive
-- 
CMake