[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-285-g10a7ea1

[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  10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab (commit)
       via  612ece829a24c3331154d759b1f8f82821457507 (commit)
      from  7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef (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=10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab
commit 10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab
Merge: 7eb3cd5 612ece8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:32:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:32:43 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    612ece82 fixup! cmLocalGenerator: Add current binary directory accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=612ece829a24c3331154d759b1f8f82821457507
commit 612ece829a24c3331154d759b1f8f82821457507
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:25:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:25:13 2015 +0200

    fixup! cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0e7aa45..7bee268 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -642,7 +642,8 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(),
+                                    cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";

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

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


hooks/post-receive
-- 
CMake