diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-16 14:39:44 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-16 10:40:09 -0400 |
| commit | a59b35ba33123da05adf09878a38f4ab3475a7a1 (patch) | |
| tree | 4123870caf7727ad4816863e8559ffa037bddaac /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 0cae3228b8db86cb4ea63b68bd61c47f0a7ca5c6 (diff) | |
| parent | fb3c4715cd88bce564e3e64d844cdf4e9bebfb25 (diff) | |
| download | cmake-a59b35ba33123da05adf09878a38f4ab3475a7a1.tar.gz | |
Merge topic 'msvc-wine-showIncludes'
fb3c4715cd Ninja: Restore detection of msvc-wine showIncludes prefix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !8479
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 403766e561..6c490960d5 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -1149,7 +1149,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() |