diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-03 14:16:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-03 14:16:25 (GMT) |
| commit | 351b5ddbf329627800354b58137edb59bda6d9eb (patch) | |
| tree | 479de9717ddab1290d8feea60d9ce2ed1e809572 | |
| parent | 31c5700d4322ecfa169db2fccf385d6eced4e737 (diff) | |
| parent | b6cf93472fe25d6c91d893cd1d243dc2d0e160bb (diff) | |
| download | CMake-351b5ddbf329627800354b58137edb59bda6d9eb.zip CMake-351b5ddbf329627800354b58137edb59bda6d9eb.tar.gz CMake-351b5ddbf329627800354b58137edb59bda6d9eb.tar.bz2 | |
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
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 963118f..971a462 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -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; |