Merge topic 'ninja-armclang-windows' into release-3.21

b6cf93472f Ninja: fix ARMClang paths for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6484
This commit is contained in:
Brad King
2021-09-03 14:16:04 +00:00
committed by Kitware Robot
+2
View File
@@ -952,6 +952,8 @@ void cmGlobalNinjaGenerator::EnableLanguage(
(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "GNU") ||
(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") == "Clang") ||
(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "Clang") ||
(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") == "ARMClang") ||
(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "ARMClang") ||
(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") == "QCC") ||
(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "QCC")))) {
this->UsingGCCOnWindows = true;