diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:41:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:41:58 (GMT) |
| commit | 184dd23d2e8625faf661f9b983d7dcf55439f3a1 (patch) | |
| tree | 1b2e24b25be1673e87b6623c664def45d08ed22b /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 3ee4d19ec8bc3f115e44dc127e8f3722169e606b (diff) | |
| parent | 6c7e6b1e49f311adac8517dc70807ff49e96d411 (diff) | |
| download | CMake-184dd23d2e8625faf661f9b983d7dcf55439f3a1.zip CMake-184dd23d2e8625faf661f9b983d7dcf55439f3a1.tar.gz CMake-184dd23d2e8625faf661f9b983d7dcf55439f3a1.tar.bz2 | |
Merge topic 'nmc-cl-showincludes'
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/CMakeDetermineCompilerId.cmake')
| -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 812f032..6cdea31 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() |