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:34 (GMT) |
| commit | 90d90a5d9170c66da8fb5865b80d4fb4bc4cc23e (patch) | |
| tree | 8e68f0549b9e825c10d7687385be908e60fc29cc /Modules | |
| parent | bf6131fc9a164ddf7d2ed02b6870cdbce4efd4e8 (diff) | |
| parent | 843fc607de7654bd24eab1b6d97d69ee989a8f9c (diff) | |
| download | CMake-90d90a5d9170c66da8fb5865b80d4fb4bc4cc23e.zip CMake-90d90a5d9170c66da8fb5865b80d4fb4bc4cc23e.tar.gz CMake-90d90a5d9170c66da8fb5865b80d4fb4bc4cc23e.tar.bz2 | |
Merge topic 'clang-cl-showIncludes' into release-3.26
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 41e0e1a..f79e8b8 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -1144,7 +1144,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() |