[Cmake-commits] CMake branch, next, updated. v3.5.2-1210-g6d6ed1a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6d6ed1aa0e83ef0b4befce8c12bac276b0061b85 (commit)
       via  66de0866a3ddd0fc6ef4d7333f08135180a5c3cf (commit)
      from  552d01e5e9460ff2ee9a7f307d175c66bc8dd592 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d6ed1aa0e83ef0b4befce8c12bac276b0061b85
commit 6d6ed1aa0e83ef0b4befce8c12bac276b0061b85
Merge: 552d01e 66de086
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 08:45:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 3 08:45:07 2016 -0400

    Merge topic 'clang-cl-showincludes' into next
    
    66de0866 Ninja: Fix clang-cl /showIncludes prefix detection


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66de0866a3ddd0fc6ef4d7333f08135180a5c3cf
commit 66de0866a3ddd0fc6ef4d7333f08135180a5c3cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 08:40:20 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 08:43:13 2016 -0400

    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

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()

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake