diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-09 19:20:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-09 19:20:26 (GMT) |
| commit | 9996b9846d5131e98d01c754eb50893d83314c3c (patch) | |
| tree | 08d9227b1e54de66aadd82d797ee72f32816d9b0 | |
| parent | 39ae025842133edad83470d2713b9ae9a6306a53 (diff) | |
| parent | 54535f47302572616eae1f207fb0c4b9df91f828 (diff) | |
| download | CMake-9996b9846d5131e98d01c754eb50893d83314c3c.zip CMake-9996b9846d5131e98d01c754eb50893d83314c3c.tar.gz CMake-9996b9846d5131e98d01c754eb50893d83314c3c.tar.bz2 | |
Merge branch 'ninja-intel-linux' into release
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
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; |