From 66de0866a3ddd0fc6ef4d7333f08135180a5c3cf Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 3 May 2016 08:40:20 -0400 Subject: Ninja: Fix clang-cl /showIncludes prefix detection We run MSVC-like compilers with the `/showIncludes` option and match the output to extract the corresponding message. Fix the matching to support compilers like `clang-cl` that print the message on the first line such that it is not preceded by a newline. LLVM-Issue: https://llvm.org/bugs/show_bug.cgi?id=27226 --- Modules/CMakeDetermineCompilerId.cmake | 4 ++-- 1 file 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() -- cgit v0.12