diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-26 14:35:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-26 14:35:41 (GMT) |
| commit | e1fd64837d5bc2fcb425cf9ba24fc1d136e40bde (patch) | |
| tree | 498fa916e63605502bc51f4eee9508bf2bf71d3b /Source/cmNinjaTargetGenerator.cxx | |
| parent | 170c50da38d0735059b7729c7429b75e77683af9 (diff) | |
| parent | 76a88888bc80b05b05fc04a188f277d7671933b4 (diff) | |
| download | CMake-e1fd64837d5bc2fcb425cf9ba24fc1d136e40bde.zip CMake-e1fd64837d5bc2fcb425cf9ba24fc1d136e40bde.tar.gz CMake-e1fd64837d5bc2fcb425cf9ba24fc1d136e40bde.tar.bz2 | |
Merge topic 'ninja-msvc-deps-for-intel'
76a8888 Ninja: deptype msvc for Intel's compiler on Windows
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -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 b132db6..3f95e6b 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; |