diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2013-11-25 08:03:01 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2013-11-25 08:08:40 (GMT) |
| commit | 76a88888bc80b05b05fc04a188f277d7671933b4 (patch) | |
| tree | 7ae69232c1d9446fe444931c43b98af14b5b4f98 | |
| parent | ac2acd22dd98172af52034e59db9d1652033dd37 (diff) | |
| download | CMake-76a88888bc80b05b05fc04a188f277d7671933b4.zip CMake-76a88888bc80b05b05fc04a188f277d7671933b4.tar.gz CMake-76a88888bc80b05b05fc04a188f277d7671933b4.tar.bz2 | |
Ninja: deptype msvc for Intel's compiler on Windows
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
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; |