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:26 (GMT) |
| commit | eec847cca5322e5c72fb018f0454a409e9f9dd66 (patch) | |
| tree | a676a93a51a2d726cb5ca6544d2e3c783e0dd681 /Source | |
| parent | a89ae726f4cd7cb3c3e9d318f478e6ef90b0df60 (diff) | |
| parent | b6cf93472fe25d6c91d893cd1d243dc2d0e160bb (diff) | |
| download | CMake-eec847cca5322e5c72fb018f0454a409e9f9dd66.zip CMake-eec847cca5322e5c72fb018f0454a409e9f9dd66.tar.gz CMake-eec847cca5322e5c72fb018f0454a409e9f9dd66.tar.bz2 | |
Merge topic 'ninja-armclang-windows'
b6cf93472f Ninja: fix ARMClang paths for Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6484
Diffstat (limited to 'Source')
| -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 47a931d..c6f82f9 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/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; |