[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5729-g05bcaed

[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  05bcaed2d6603958e1dfbab5fa1c52b1f66306c3 (commit)
       via  76a88888bc80b05b05fc04a188f277d7671933b4 (commit)
       via  ac2acd22dd98172af52034e59db9d1652033dd37 (commit)
      from  3b30ff6cb8e465e3152e17da655e74b8ac331a12 (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=05bcaed2d6603958e1dfbab5fa1c52b1f66306c3
commit 05bcaed2d6603958e1dfbab5fa1c52b1f66306c3
Merge: 3b30ff6 76a8888
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 03:09:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 03:09:32 2013 -0500

    Merge topic 'ninja-msvc-deps-for-intel' into next
    
    76a8888 Ninja: deptype msvc for Intel's compiler on Windows
    ac2acd2 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76a88888bc80b05b05fc04a188f277d7671933b4
commit 76a88888bc80b05b05fc04a188f277d7671933b4
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 09:03:01 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Nov 25 09:08:40 2013 +0100

    Ninja: deptype msvc for Intel's compiler on Windows

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 26eadbe..e7e0a1d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -360,10 +360,11 @@ cmNinjaTargetGenerator
 
   cmMakefile* mf = this->GetMakefile();
 
-  const bool usingMSVC = std::string("MSVC") ==
-                       (mf->GetDefinition("CMAKE_C_COMPILER_ID") ?
-                    mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") :
-                    mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"));
+  const std::string cId = mf->GetDefinition("CMAKE_C_COMPILER_ID")
+                          ? mf->GetSafeDefinition("CMAKE_C_COMPILER_ID")
+                          : mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID");
+
+  const bool usingMSVC = (cId == "MSVC" || cId == "Intel");
 
   // Tell ninja dependency format so all deps can be loaded into a database
   std::string deptype;

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

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


hooks/post-receive
-- 
CMake