diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:41:50 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 07:41:57 -0400 |
| commit | 1915a09884c40b4eed29de871962fe783ca17fe0 (patch) | |
| tree | 10393501e86d29570643dc31265030c7e33ce868 /Modules | |
| parent | 2fe8ea555e75c3bd66f285c22bb7be342f5b939f (diff) | |
| parent | 6c7e6b1e49f311adac8517dc70807ff49e96d411 (diff) | |
| download | cmake-1915a09884c40b4eed29de871962fe783ca17fe0.tar.gz | |
Merge topic 'nmc-cl-showincludes' into release-3.17
6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4526
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index d125791f22..a7b4950bcf 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -128,7 +128,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) set(CMAKE_EXECUTABLE_FORMAT "Unknown" CACHE INTERNAL "Executable file format") endif() - if(CMAKE_GENERATOR STREQUAL "Ninja" AND MSVC_${lang}_ARCHITECTURE_ID) + if(CMAKE_GENERATOR MATCHES "^Ninja" AND MSVC_${lang}_ARCHITECTURE_ID) foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "") CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX(${lang} "${userflags}") endforeach() |