[Cmake-commits] CMake branch, next, updated. v2.8.9-351-gcc70b21

[Peter Kuemmel]

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  cc70b2151b4344d0c0dd79259d612d05eda09e1d (commit)
       via  9b8b4c11d8e7807c0b8e6d9bea490f20f3ad0367 (commit)
       via  508ed6940b447c2fb6b5fe4f036138ce57ab3c4c (commit)
      from  44f126ab785f881dc3582fea137f9f948e6506d8 (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=cc70b2151b4344d0c0dd79259d612d05eda09e1d
commit cc70b2151b4344d0c0dd79259d612d05eda09e1d
Merge: 44f126a 9b8b4c1
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Sep 4 13:00:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 4 13:00:10 2012 -0400

    Merge topic 'ninja-BuildDepends' into next
    
    9b8b4c1 Ninja: fix BuildDepends test
    508ed69 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b8b4c11d8e7807c0b8e6d9bea490f20f3ad0367
commit 9b8b4c11d8e7807c0b8e6d9bea490f20f3ad0367
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Sep 4 18:55:15 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Sep 4 18:55:15 2012 +0200

    Ninja: fix BuildDepends test
    
    IsInTryCompile could also be true when the project name is not
    TRY_COMPILE, but we only wanna suppress this very special case
    while compiler detection.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 918f582..bdb50b1 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");
-    if (!clDepsBinary.empty() &&
-        !this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile())
+    const std::string name = mf->GetProjectName() ? mf->GetProjectName() : "";
+    if (!clDepsBinary.empty() && name != "TRY_COMPILE")
       {
       clShowPrefix = mf->GetSafeDefinition("CMAKE_CL_SHOWINCLUDE_PREFIX");
       clBinary = mf->GetDefinition("CMAKE_C_COMPILER") ?

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmNinjaTargetGenerator.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake