Browse Source

Merge topic 'ninja-armclang-windows'

b6cf93472f Ninja: fix ARMClang paths for Windows

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6484
Brad King 4 years ago
parent
commit
eec847cca5
1 changed files with 2 additions and 0 deletions
  1. 2 0
      Source/cmGlobalNinjaGenerator.cxx

+ 2 - 0
Source/cmGlobalNinjaGenerator.cxx

@@ -945,6 +945,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;