Commit 9996b984 authored by Brad King's avatar Brad King
Browse files

Merge branch 'ninja-intel-linux' into release

parents 39ae0258 54535f47
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment