[Cmake-commits] CMake branch, next, updated. v3.6.1-1537-g978941f

[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  978941f83ab3e4bd80ac52100a13c68a85bb8ce0 (commit)
       via  99483b9f9828e459e3e7887cea02d82aae887866 (commit)
      from  677090f0749b78f9cc44e33c7a77c6eda977be0f (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=978941f83ab3e4bd80ac52100a13c68a85bb8ce0
commit 978941f83ab3e4bd80ac52100a13c68a85bb8ce0
Merge: 677090f 99483b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 09:13:44 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 27 09:13:44 2016 -0400

    Merge topic 'cleanup-Convert' into next
    
    99483b9f Revert "Makefiles: Remove uselss uses of Convert"


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

    Revert "Makefiles: Remove uselss uses of Convert"
    
    This reverts commit ad4b7e05980bd53686fd48ba341c954985ad3056.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index b3d601a..cb82d0a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -835,7 +835,8 @@ std::string cmLocalUnixMakefileGenerator3::GetRelativeTargetDirectory(
 {
   std::string dir = this->HomeRelativeOutputPath;
   dir += this->GetTargetDirectory(target);
-  return dir;
+  return this->Convert(dir, cmOutputConverter::NONE,
+                       cmOutputConverter::UNCHANGED);
 }
 
 void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags,
@@ -981,7 +982,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
                                         : cmOutputConverter::NONE);
       std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
       if (shellCommand.empty()) {
-        shellCommand = cmd;
+        shellCommand = this->Convert(cmd, cmOutputConverter::NONE);
       }
       cmd = launcher + shellCommand;
 

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

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


hooks/post-receive
-- 
CMake