kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ninja-intel-linux' into release

This commit is contained in:
Brad King 2014-05-09 15:20:26 -04:00
parent 39ae025842 54535f4730
commit 9996b9846d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmNinjaTargetGenerator.cxx
View File

@ -369,8 +369,10 @@ cmNinjaTargetGenerator
const std::string cId = mf->GetDefinition("CMAKE_C_COMPILER_ID") const std::string cId = mf->GetDefinition("CMAKE_C_COMPILER_ID")
? mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") ? mf->GetSafeDefinition("CMAKE_C_COMPILER_ID")
: mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"); : mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID");
const std::string sId = mf->GetDefinition("CMAKE_C_SIMULATE_ID")
const bool usingMSVC = (cId == "MSVC" || cId == "Intel"); ? 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 // Tell ninja dependency format so all deps can be loaded into a database
std::string deptype; std::string deptype;