[Cmake-commits] CMake branch, next, updated. v3.6.1-1535-g677090f

[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  677090f0749b78f9cc44e33c7a77c6eda977be0f (commit)
       via  ad4b7e05980bd53686fd48ba341c954985ad3056 (commit)
      from  2b114c41b54c4d14745b2b98c57ccc7c92111f7e (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=677090f0749b78f9cc44e33c7a77c6eda977be0f
commit 677090f0749b78f9cc44e33c7a77c6eda977be0f
Merge: 2b114c4 ad4b7e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 08:47:44 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 27 08:47:44 2016 -0400

    Merge topic 'cleanup-Convert' into next
    
    ad4b7e05 Makefiles: Remove uselss uses of Convert


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad4b7e05980bd53686fd48ba341c954985ad3056
commit ad4b7e05980bd53686fd48ba341c954985ad3056
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 13:44:53 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 27 14:47:13 2016 +0200

    Makefiles: Remove uselss uses of Convert
    
    Convert with NONE and UNCHANGED is a no-op.

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

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

Summary of changes:


hooks/post-receive
-- 
CMake