[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3085-gc0fa1c2

[Brad King]

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  c0fa1c29192da45f8f9c1d288aefc5f260b9f260 (commit)
       via  54535f47302572616eae1f207fb0c4b9df91f828 (commit)
      from  b087322a2bf2b640e307842a7fd413243be702a0 (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=c0fa1c29192da45f8f9c1d288aefc5f260b9f260
commit c0fa1c29192da45f8f9c1d288aefc5f260b9f260
Merge: b087322 54535f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 9 15:18:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 9 15:18:28 2014 -0400

    Merge topic 'ninja-intel-linux' into next
    
    54535f47 Ninja: Fix deptype for Intel compiler on Linux


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54535f47302572616eae1f207fb0c4b9df91f828
commit 54535f47302572616eae1f207fb0c4b9df91f828
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 9 15:08:16 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 9 15:11:54 2014 -0400

    Ninja: Fix deptype for Intel compiler on Linux
    
    Since commit v3.0.0-rc1~305^2 (Ninja: deptype msvc for Intel's compiler
    on Windows, 2013-11-25) we used "deps = msvc" for the Intel compiler.
    This is correct only on Windows.  On Linux we still want "deps = gcc".
    
    Fix the logic to use "deps = msvc" when the compiler id or the "simulate
    id" is "MSVC".  This will preserve the behavior on Intel for Windows and
    fix the behavior on Intel for Linux.  In the future this should be
    converted to a platform information module variable.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 900af8d..3220fba 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -369,8 +369,10 @@ cmNinjaTargetGenerator
   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");
+  const std::string sId = mf->GetDefinition("CMAKE_C_SIMULATE_ID")
+                          ? mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID")
+                          : mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID");
+  const bool usingMSVC = (cId == "MSVC" || sId == "MSVC");
 
   // Tell ninja dependency format so all deps can be loaded into a database
   std::string deptype;

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake