[Cmake-commits] CMake branch, next, updated. v3.6.1-1575-g50eca8d

[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  50eca8d02d62159621925b248b6525df2e974892 (commit)
       via  062a47f11cbdd8de610c82aa94f3fc5307817e80 (commit)
      from  39c455a26827178bf2b2cc585dc59fad3329b5ee (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=50eca8d02d62159621925b248b6525df2e974892
commit 50eca8d02d62159621925b248b6525df2e974892
Merge: 39c455a 062a47f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 30 09:18:37 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 30 09:18:37 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=062a47f11cbdd8de610c82aa94f3fc5307817e80
commit 062a47f11cbdd8de610c82aa94f3fc5307817e80
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 30 09:15:16 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 30 09:15:16 2016 -0400

    fixup! Makefiles: Replace method with Wacom specific API

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 7fa35b8..3c4841e 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -592,7 +592,7 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule(
   }
 }
 
-std::string cmLocalUnixMakefileGenerator3::MaybeConvertWacomShellCommand(
+std::string cmLocalUnixMakefileGenerator3::MaybeConvertWatcomShellCommand(
   std::string const& cmd)
 {
   if (this->IsWatcomWMake() && cmSystemTools::FileIsFullPath(cmd.c_str()) &&
@@ -638,7 +638,7 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
   }
 
   std::string cmakeShellCommand =
-    this->MaybeConvertWacomShellCommand(cmSystemTools::GetCMakeCommand());
+    this->MaybeConvertWatcomShellCommand(cmSystemTools::GetCMakeCommand());
   if (cmakeShellCommand.empty()) {
     cmakeShellCommand = this->ConvertToOutputFormat(
       cmSystemTools::CollapseFullPath(cmSystemTools::GetCMakeCommand()),
@@ -1007,7 +1007,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
         }
       }
 
-      std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
+      std::string shellCommand = this->MaybeConvertWatcomShellCommand(cmd);
       if (shellCommand.empty()) {
         shellCommand =
           this->ConvertToOutputFormat(cmd, cmOutputConverter::SHELL);
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index bc7566e..3e90055 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -250,7 +250,7 @@ protected:
   void CheckMultipleOutputs(bool verbose);
 
 private:
-  std::string MaybeConvertWacomShellCommand(std::string const& cmd);
+  std::string MaybeConvertWatcomShellCommand(std::string const& cmd);
 
   void ComputeObjectFilenames(
     std::map<cmSourceFile const*, std::string>& mapping,

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    6 +++---
 Source/cmLocalUnixMakefileGenerator3.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake