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 adcef9697b33c0e574b32e7a1a4f7579c7ec9524 (commit)
via c875be5cee7d411d63f98e31d824f3636278b401 (commit)
from 6b1ccc4ad2de5548db2d607a41f944b7acdf7102 (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=adcef9697b33c0e574b32e7a1a4f7579c7ec9524
commit adcef9697b33c0e574b32e7a1a4f7579c7ec9524
Merge: 6b1ccc4 c875be5
Author: Peter Kuemmel <[email protected]>
AuthorDate: Wed Sep 5 08:30:29 2012 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Sep 5 08:30:29 2012 -0400
Merge topic 'ninja-BuildDepends' into next
c875be5 Ninja: undo, and fix via try_compile feature
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c875be5cee7d411d63f98e31d824f3636278b401
commit c875be5cee7d411d63f98e31d824f3636278b401
Author: Peter Kümmel <[email protected]>
AuthorDate: Wed Sep 5 14:29:22 2012 +0200
Commit: Peter Kümmel <[email protected]>
CommitDate: Wed Sep 5 14:29:22 2012 +0200
Ninja: undo, and fix via try_compile feature
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index bdb50b1..918f582 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -355,8 +355,8 @@ cmNinjaTargetGenerator
if (lang == "C" || lang == "CXX" || lang == "RC")
{
clDepsBinary = mf->GetSafeDefinition("CMAKE_CMCLDEPS_EXECUTABLE");
- const std::string name = mf->GetProjectName() ? mf->GetProjectName() : "";
- if (!clDepsBinary.empty() && name != "TRY_COMPILE")
+ if (!clDepsBinary.empty() &&
+ !this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile())
{
clShowPrefix = mf->GetSafeDefinition("CMAKE_CL_SHOWINCLUDE_PREFIX");
clBinary = mf->GetDefinition("CMAKE_C_COMPILER") ?
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaTargetGenerator.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
