[Cmake-commits] CMake branch, next, updated. v2.8.7-3428-g9ecaf50
Peter Kuemmel
syntheticpp at gmx.net
Sat Apr 7 15:56:23 EDT 2012
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 9ecaf50b2993c5584095642bb45447af2123e5f0 (commit)
via b8c3e8c1f1083ef9f8ece6b1cdb0cbe6dc50c79a (commit)
via 11bd9b5588a9ea4922591772e633db5f4ac0862c (commit)
from dc357a2167c7a239270bb5b4243fb2d81fa7734d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ecaf50b2993c5584095642bb45447af2123e5f0
commit 9ecaf50b2993c5584095642bb45447af2123e5f0
Merge: dc357a2 b8c3e8c
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Apr 7 15:56:19 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 7 15:56:19 2012 -0400
Merge topic 'ninja-patches' into next
b8c3e8c Ninja: enable Ninja for CodeBlocks
11bd9b5 Ninja: remove GCC -Wshadow warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8c3e8c1f1083ef9f8ece6b1cdb0cbe6dc50c79a
commit b8c3e8c1f1083ef9f8ece6b1cdb0cbe6dc50c79a
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Apr 7 21:40:17 2012 +0200
Commit: Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Apr 7 21:54:57 2012 +0200
Ninja: enable Ninja for CodeBlocks
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index ccb17f0..084c904 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -60,6 +60,9 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
// disable until somebody actually tests it:
// this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
#endif
+#ifdef CMAKE_USE_NINJA
+ this->SupportedGlobalGenerators.push_back("Ninja");
+#endif
this->SupportedGlobalGenerators.push_back("Unix Makefiles");
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11bd9b5588a9ea4922591772e633db5f4ac0862c
commit 11bd9b5588a9ea4922591772e633db5f4ac0862c
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Apr 7 21:41:05 2012 +0200
Commit: Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Apr 7 21:41:41 2012 +0200
Ninja: remove GCC -Wshadow warning
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 25d742b..cf2b427 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -432,7 +432,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
// If we have any PRE_LINK commands, we need to go back to HOME_OUTPUT for
// the link commands.
if (!preLinkCmdLines.empty()) {
- std::string path = this->GetLocalGenerator()->ConvertToOutputFormat(
+ path = this->GetLocalGenerator()->ConvertToOutputFormat(
this->GetMakefile()->GetHomeOutputDirectory(),
cmLocalGenerator::SHELL);
preLinkCmdLines.push_back("cd " + path);
-----------------------------------------------------------------------
Summary of changes:
Source/cmExtraCodeBlocksGenerator.cxx | 3 +++
Source/cmNinjaNormalTargetGenerator.cxx | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list