diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-12 13:31:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-12 13:31:04 (GMT) |
| commit | 68f6460f66554343afa5e05c1913b17323bdafbe (patch) | |
| tree | fb7039e080e57ae6da1a7e7e9e1f18121a327072 | |
| parent | c1e428c0393c62a32dfd54fadfc34546c9c004d8 (diff) | |
| parent | 54535f47302572616eae1f207fb0c4b9df91f828 (diff) | |
| download | CMake-68f6460f66554343afa5e05c1913b17323bdafbe.zip CMake-68f6460f66554343afa5e05c1913b17323bdafbe.tar.gz CMake-68f6460f66554343afa5e05c1913b17323bdafbe.tar.bz2 | |
Merge topic 'ninja-intel-linux'
54535f47 Ninja: Fix deptype for Intel compiler on Linux
| -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 292a22f..54e398c 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -391,8 +391,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; |