diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-21 12:57:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-21 12:57:35 (GMT) |
| commit | 2cdb0bae28601d103d465bc92e527f1caed06bce (patch) | |
| tree | 019c3d4531f739de17775a28913774ae2a923b24 /Modules | |
| parent | 3bab70b5ab778237d43279c5973257efe950a5fd (diff) | |
| parent | 843fc607de7654bd24eab1b6d97d69ee989a8f9c (diff) | |
| download | CMake-2cdb0bae28601d103d465bc92e527f1caed06bce.zip CMake-2cdb0bae28601d103d465bc92e527f1caed06bce.tar.gz CMake-2cdb0bae28601d103d465bc92e527f1caed06bce.tar.bz2 | |
Merge topic 'clang-cl-showIncludes'
843fc607de Ninja: Restore detection of clang-cl showIncludes prefix
3346570ae9 Tests: Comment RunCMake.Ninja ShowIncludes sample input languages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8344
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 0878dff..67044fb 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -1147,7 +1147,7 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags) ENCODING AUTO # cl prints in console output code page ) string(REPLACE "\n" "\n " msg " ${out}") - if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n][^:\n]+:[^:\n]*[^: \n][^: \n]:?[ \t]+)[A-Za-z]:\\\\") + if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n][^:\n]+:[^:\n]*[^: \n][^: \n]:?[ \t]+)([A-Za-z]:\\\\|\\./)") set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_2}" PARENT_SCOPE) string(APPEND msg "\nFound prefix \"${CMAKE_MATCH_2}\"") else() |