[Cmake-commits] CMake branch, next, updated. v3.6.1-1545-ge0cb867

[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  e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e (commit)
       via  638f907bc6f61935714d688df20611fc65385c27 (commit)
      from  11a80af5b291997c173df0451fddfa3aaa4f4752 (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=e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e
commit e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e
Merge: 11a80af 638f907
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 09:17:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 27 09:17:11 2016 -0400

    Merge topic 'cleanup-Convert' into next
    
    638f907b Makefiles: Replace method with Wacom specific API


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=638f907bc6f61935714d688df20611fc65385c27
commit 638f907bc6f61935714d688df20611fc65385c27
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 15:16:50 2016 +0200

    Makefiles: Replace method with Wacom specific API
    
    The existing method uses RelativeRoot NONE and FULL values.  In
    principle, those should be segregated interfaces.  Mixing
    NONE and FULL into the RelativeRoot enum is a case of
    
     http://thedailywtf.com/articles/What_Is_Truth_0x3f_

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f2ef5c8..2ef9a39 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -592,8 +592,8 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule(
   }
 }
 
-std::string cmLocalUnixMakefileGenerator3::ConvertShellCommand(
-  std::string const& cmd, cmOutputConverter::RelativeRoot root)
+std::string cmLocalUnixMakefileGenerator3::MaybeConvertWacomShellCommand(
+  std::string const& cmd)
 {
   if (this->IsWatcomWMake() && cmSystemTools::FileIsFullPath(cmd.c_str()) &&
       cmd.find_first_of("( )") != cmd.npos) {
@@ -606,7 +606,7 @@ std::string cmLocalUnixMakefileGenerator3::ConvertShellCommand(
                            cmOutputConverter::SHELL);
     }
   }
-  return this->Convert(cmd, root, cmOutputConverter::SHELL);
+  return std::string();
 }
 
 void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
@@ -638,8 +638,13 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
 #endif
   }
 
-  std::string cmakeShellCommand = this->ConvertShellCommand(
-    cmSystemTools::GetCMakeCommand(), cmOutputConverter::FULL);
+  std::string cmakeShellCommand =
+    this->MaybeConvertWacomShellCommand(cmSystemTools::GetCMakeCommand());
+  if (cmakeShellCommand.empty()) {
+    cmakeShellCommand =
+      this->Convert(cmSystemTools::GetCMakeCommand(), cmOutputConverter::FULL,
+                    cmOutputConverter::SHELL);
+  }
 
   /* clang-format off */
   makefileStream
@@ -975,7 +980,12 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
       std::string launcher = this->MakeLauncher(
         ccg, target, workingDir.empty() ? cmOutputConverter::START_OUTPUT
                                         : cmOutputConverter::NONE);
-      cmd = launcher + this->ConvertShellCommand(cmd, cmOutputConverter::NONE);
+      std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
+      if (shellCommand.empty()) {
+        shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
+                                     cmOutputConverter::SHELL);
+      }
+      cmd = launcher + shellCommand;
 
       ccg.AppendArguments(c, cmd);
       if (content) {
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 243cc3d..9541f65 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -250,8 +250,7 @@ protected:
   void CheckMultipleOutputs(bool verbose);
 
 private:
-  std::string ConvertShellCommand(std::string const& cmd,
-                                  cmOutputConverter::RelativeRoot root);
+  std::string MaybeConvertWacomShellCommand(std::string const& cmd);
   std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
                            cmGeneratorTarget* target,
                            cmOutputConverter::RelativeRoot relative);

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

Summary of changes:


hooks/post-receive
-- 
CMake