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 32389a10550df33224522978f5b9d6794c628d55 (commit)
via 9040d96d3dad86d081f76f957e9dfc54b7379406 (commit)
from 799348a2d38e6237561168184fcab801262ffe3a (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=32389a10550df33224522978f5b9d6794c628d55
commit 32389a10550df33224522978f5b9d6794c628d55
Merge: 799348a 9040d96
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Aug 27 09:41:09 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Aug 27 09:41:09 2016 -0400
Merge topic 'cleanup-Convert' into next
9040d96d format code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9040d96d3dad86d081f76f957e9dfc54b7379406
commit 9040d96d3dad86d081f76f957e9dfc54b7379406
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Aug 27 15:40:44 2016 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sat Aug 27 15:40:47 2016 +0200
format code
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 660483e..7fa35b8 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -665,14 +665,16 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
makefileStream
<< "# The top-level source directory on which CMake was run.\n"
<< "CMAKE_SOURCE_DIR = "
- <<
this->ConvertToOutputFormat(cmSystemTools::CollapseFullPath(this->GetSourceDirectory()),
+ << this->ConvertToOutputFormat(
+ cmSystemTools::CollapseFullPath(this->GetSourceDirectory()),
cmOutputConverter::SHELL)
<< "\n"
<< "\n";
makefileStream
<< "# The top-level build directory on which CMake was run.\n"
<< "CMAKE_BINARY_DIR = "
- <<
this->ConvertToOutputFormat(cmSystemTools::CollapseFullPath(this->GetBinaryDirectory()),
+ << this->ConvertToOutputFormat(
+ cmSystemTools::CollapseFullPath(this->GetBinaryDirectory()),
cmOutputConverter::SHELL)
<< "\n"
<< "\n";
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
