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 1991df2f67e587f01de2836f09015fc1983d1a45 (commit) via cc5e6b82c2ae8293a400b604e0366578f9097d94 (commit) from e0f428248c51aacfc2b9e53cca5b88aa15042013 (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=1991df2f67e587f01de2836f09015fc1983d1a45 commit 1991df2f67e587f01de2836f09015fc1983d1a45 Merge: e0f4282 cc5e6b8 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Oct 8 05:36:14 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Oct 8 05:36:14 2016 -0400 Merge topic 'ninja-cleanups' into next cc5e6b82 Ninja: Extract identical code from condition https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc5e6b82c2ae8293a400b604e0366578f9097d94 commit cc5e6b82c2ae8293a400b604e0366578f9097d94 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Oct 4 22:56:32 2016 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sat Oct 8 11:36:02 2016 +0200 Ninja: Extract identical code from condition diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 22fae4c..b04c11d 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -492,10 +492,8 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher( if (ccg.GetWorkingDirectory().empty()) { output = this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), output); - output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); - } else { - output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } + output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } vars.Output = output.c_str(); ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits