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 43d02bf54b86076ffa4ad0bb30b087a51c0b860e (commit)
via b3f40570a5530c01a5d517a779027ae27d1bbf69 (commit)
from 201e5242dfc8e3dd1af8bb5ffca76a61226c9195 (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=43d02bf54b86076ffa4ad0bb30b087a51c0b860e
commit 43d02bf54b86076ffa4ad0bb30b087a51c0b860e
Merge: 201e524 b3f4057
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Tue May 24 02:19:54 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 24 02:19:54 2016 -0400
Merge topic 'output-converter-enums' into next
b3f40570 Fixup: Use enums defined in cmOutputConverter...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3f40570a5530c01a5d517a779027ae27d1bbf69
commit b3f40570a5530c01a5d517a779027ae27d1bbf69
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Tue May 24 08:18:35 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Tue May 24 08:18:35 2016 +0200
Fixup: Use enums defined in cmOutputConverter...
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 5e16a05..8d4955b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -642,13 +642,15 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
makefileStream
<< "# The CMake executable.\n"
<< "CMAKE_COMMAND = "
- << this->ConvertShellCommand(cmSystemTools::GetCMakeCommand(),
cmOutputConverter::FULL)
+ << this->ConvertShellCommand(cmSystemTools::GetCMakeCommand(),
+ cmOutputConverter::FULL)
<< "\n"
<< "\n";
makefileStream
<< "# The command to remove a file.\n"
<< "RM = "
- << this->ConvertShellCommand(cmSystemTools::GetCMakeCommand(),
cmOutputConverter::FULL)
+ << this->ConvertShellCommand(cmSystemTools::GetCMakeCommand(),
+ cmOutputConverter::FULL)
<< " -E remove -f\n"
<< "\n";
makefileStream
@@ -658,13 +660,17 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
makefileStream
<< "# The top-level source directory on which CMake was run.\n"
<< "CMAKE_SOURCE_DIR = "
- << this->Convert(this->GetSourceDirectory(), cmOutputConverter::FULL,
cmOutputConverter::SHELL)
+ << this->Convert(this->GetSourceDirectory(),
+ cmOutputConverter::FULL,
+ cmOutputConverter::SHELL)
<< "\n"
<< "\n";
makefileStream
<< "# The top-level build directory on which CMake was run.\n"
<< "CMAKE_BINARY_DIR = "
- << this->Convert(this->GetBinaryDirectory(), cmOutputConverter::FULL,
cmOutputConverter::SHELL)
+ << this->Convert(this->GetBinaryDirectory(),
+ cmOutputConverter::FULL,
+ cmOutputConverter::SHELL)
<< "\n"
<< "\n";
/* clang-format on */
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
