diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-19 15:59:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-19 16:00:12 (GMT) |
| commit | f79e684678fb481c91586bd015d03bfb9e1a019b (patch) | |
| tree | ca37dcb9cec81b8103c5b3037038be2683982fc9 | |
| parent | a2daa3ef2706bf3d0436d5d6ef91d263cd98bf6c (diff) | |
| parent | 8738e2584a111de065341296dcfa1f4ac9c68346 (diff) | |
| download | CMake-f79e684678fb481c91586bd015d03bfb9e1a019b.zip CMake-f79e684678fb481c91586bd015d03bfb9e1a019b.tar.gz CMake-f79e684678fb481c91586bd015d03bfb9e1a019b.tar.bz2 | |
Merge topic 'QCC-ninja-support'
8738e2584a cmGlobalNinjaGenerator: Use gnu compatible paths with QCC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3567
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 69a7da9..7e81a54 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -639,7 +639,9 @@ void cmGlobalNinjaGenerator::EnableLanguage( (mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") == "GNU") || (mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "GNU") || (mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") == "Clang") || - (mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "Clang")))) { + (mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "Clang") || + (mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") == "QCC") || + (mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID") == "QCC")))) { this->UsingGCCOnWindows = true; } #endif |