diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-08 14:40:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-08 14:40:52 (GMT) |
| commit | f610541523d44301d2a814531af4c5c21d7d3fed (patch) | |
| tree | 44b5db9f8156a1bc98fc8544eef865b23a2a20d9 /Modules | |
| parent | 6efc497ab48846beeaead4b2205bb54989b836e4 (diff) | |
| parent | 0d933fc0d9bb7bdaed1997c0ae06567115242f74 (diff) | |
| download | CMake-f610541523d44301d2a814531af4c5c21d7d3fed.zip CMake-f610541523d44301d2a814531af4c5c21d7d3fed.tar.gz CMake-f610541523d44301d2a814531af4c5c21d7d3fed.tar.bz2 | |
Merge topic 'clang-cl-showIncludes' into release-3.29
0d933fc0d9 Ninja: Update showIncludes prefix detection for clang-cl 18
a88acb0a41 Tests/RunCMake/Ninja: Rename showIncludes case for clang-cl <= 17
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9229
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 b380aa5..25aacca 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -1182,7 +1182,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() |