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:07 -0400 |
| commit | 37f06fad18232b4e7206e380aefd6d27112c7ec3 (patch) | |
| tree | e9ad6e38011de33ad1426ff88c0396755668b4dc /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 822aa26915613d87de8ee19c8b45f7535ffca98f (diff) | |
| parent | fb3c4715cd88bce564e3e64d844cdf4e9bebfb25 (diff) | |
| download | cmake-37f06fad18232b4e7206e380aefd6d27112c7ec3.tar.gz | |
Merge topic 'msvc-wine-showIncludes' into release-3.26release
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 f79e8b8d39..2250d63e78 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() |