[Cmake-commits] CMake branch, master, updated. v3.9.0-rc2-26-g55d752b

[Kitware Robot]

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, master has been updated
       via  55d752b10855f22642dc69fd99a79af6d085831b (commit)
       via  f44d9bcc8f09c3a135fa0feb82e9d71c475eb196 (commit)
      from  51e1e23cf477e3918e7b98b7ae14a7041d0734f8 (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=55d752b10855f22642dc69fd99a79af6d085831b
commit 55d752b10855f22642dc69fd99a79af6d085831b
Merge: 51e1e23 f44d9bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 9 14:00:41 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 9 10:00:57 2017 -0400

    Merge topic 'improve-msvc-feature-checks'
    
    f44d9bcc C++ feature checks: Improve exclusion of "0 Warning(s)"
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !938


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f44d9bcc8f09c3a135fa0feb82e9d71c475eb196
commit f44d9bcc8f09c3a135fa0feb82e9d71c475eb196
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 8 09:21:21 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 8 09:22:09 2017 -0400

    C++ feature checks: Improve exclusion of "0 Warning(s)"
    
    Simply matching "0 Warning" may match "10 Warning(s)".  Instead remove
    the entire `    0 Warning(s)` content from the MSBuild output before
    searching it for warnings.
    
    Issue: #16942

diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index c9a19af..3b08025 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -14,8 +14,10 @@ function(cm_check_cxx_feature name)
       CMAKE_FLAGS ${maybe_cxx_standard}
       OUTPUT_VARIABLE OUTPUT
       )
+    # Filter out MSBuild output that looks like a warning.
+    string(REGEX REPLACE " +0 Warning\\(s\\)" "" check_output "${OUTPUT}")
     # If using the feature causes warnings, treat it as broken/unavailable.
-    if(OUTPUT MATCHES "[Ww]arning" AND NOT OUTPUT MATCHES "0 Warning")
+    if(check_output MATCHES "[Ww]arning")
       set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
     endif()
     if(CMake_HAVE_CXX_${FEATURE})

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

Summary of changes:
 Source/Checks/cm_cxx_features.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake