[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-384-g17bef2c

[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  17bef2cd6780731f77be1383f74ddb5d9c44bffc (commit)
       via  9dcfa5f09b2b6345c3a83612a69d3e94bc43aac9 (commit)
      from  885c6f5f348a45174cf5e3a799dc8c0f13c37e67 (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=17bef2cd6780731f77be1383f74ddb5d9c44bffc
commit 17bef2cd6780731f77be1383f74ddb5d9c44bffc
Merge: 885c6f5 9dcfa5f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 10 18:05:12 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 10 18:05:12 2016 -0400

    Merge topic 'extract-cmRulePlaceholderExpander' into next
    
    9dcfa5f0 Fix output bug


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dcfa5f09b2b6345c3a83612a69d3e94bc43aac9
commit 9dcfa5f09b2b6345c3a83612a69d3e94bc43aac9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 11 00:04:49 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 11 00:04:49 2016 +0200

    Fix output bug

diff --git a/Source/cmRulePlaceholderExpander.cxx b/Source/cmRulePlaceholderExpander.cxx
index 796c975..601c3b4 100644
--- a/Source/cmRulePlaceholderExpander.cxx
+++ b/Source/cmRulePlaceholderExpander.cxx
@@ -204,8 +204,8 @@ std::string cmRulePlaceholderExpander::ExpandRuleVariable(
     this->Compilers.find(variable);
 
   if (compIt != this->Compilers.end()) {
-    std::string ret =
-      this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER"];
+    std::string ret = outputConverter->ConvertToOutputForExisting(
+      this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER"]);
     std::string const& compilerArg1 =
       this->VariableMappings[compIt->first + "_COMPILER_ARG1"];
     std::string const& compilerTarget =

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

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


hooks/post-receive
-- 
CMake