diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-05 12:50:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-05 12:50:29 (GMT) |
| commit | 93b705a396c23f771ba203efb6f2f4934ae027b7 (patch) | |
| tree | dddf8a9df72303a493348d457d72cf918949c349 | |
| parent | baa60321692b4991fbee54e448e9bc420105fe68 (diff) | |
| parent | e555480c60e95073840fe1a5f52004fd8ce81f9c (diff) | |
| download | CMake-93b705a396c23f771ba203efb6f2f4934ae027b7.zip CMake-93b705a396c23f771ba203efb6f2f4934ae027b7.tar.gz CMake-93b705a396c23f771ba203efb6f2f4934ae027b7.tar.bz2 | |
Merge topic 'ninja-clang-rsp-format'
e555480c Ninja: Fix response file format for GNU-like Clang on Windows
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 51175c7..44418f2 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -554,11 +554,13 @@ void cmGlobalNinjaGenerator::EnableLanguage( this->ResolveLanguageCompiler(*l, mf, optional); } #ifdef _WIN32 - if (mf->IsOn("CMAKE_COMPILER_IS_MINGW") || - strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "GNU") == 0 || - strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "GNU") == 0 || - strcmp(mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID"), "GNU") == 0 || - strcmp(mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"), "GNU") == 0) { + if (strcmp(mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID"), "MSVC") != 0 && + strcmp(mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"), "MSVC") != 0 && + (mf->IsOn("CMAKE_COMPILER_IS_MINGW") || + strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "GNU") == 0 || + strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "GNU") == 0 || + strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "Clang") == 0 || + strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "Clang") == 0)) { this->UsingGCCOnWindows = true; } #endif |