diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-04 14:08:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-04 14:08:38 (GMT) |
| commit | ac714a3839586c06ad0376071c733ba21bb1a8b4 (patch) | |
| tree | ae4e6becb22eb1c7ff946bb0cc85519010ad45c1 /Modules | |
| parent | cd0af9c5e00c6ffe821b218c21b8f424c9ce5a43 (diff) | |
| parent | 66de0866a3ddd0fc6ef4d7333f08135180a5c3cf (diff) | |
| download | CMake-ac714a3839586c06ad0376071c733ba21bb1a8b4.zip CMake-ac714a3839586c06ad0376071c733ba21bb1a8b4.tar.gz CMake-ac714a3839586c06ad0376071c733ba21bb1a8b4.tar.bz2 | |
Merge topic 'clang-cl-showincludes'
66de0866 Ninja: Fix clang-cl /showIncludes prefix detection
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index b1a2cf2..465989d 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -664,8 +664,8 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang) ERROR_VARIABLE err RESULT_VARIABLE res ) - if(res EQUAL 0 AND "${out}" MATCHES "\n([^:]*:[^:]*:[ \t]*)") - set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_1}" PARENT_SCOPE) + if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n]*:[^:\n]*:[ \t]*)") + set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_2}" PARENT_SCOPE) else() set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "" PARENT_SCOPE) endif() |