[Cmake-commits] CMake branch, next, updated. v3.5.1-837-gb5effe8

[Zack Galbreath]

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  b5effe8d07183406758dabd76ab0506af7dc77e9 (commit)
       via  76756bad6d6efb462f35bd687ca8bd348bff6960 (commit)
      from  37b4d24572104b7159da87fbf3b6d4f6cd17c633 (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=b5effe8d07183406758dabd76ab0506af7dc77e9
commit b5effe8d07183406758dabd76ab0506af7dc77e9
Merge: 37b4d24 76756ba
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Apr 6 15:54:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 6 15:54:29 2016 -0400

    Merge topic 'branch_coverage_glob' into next
    
    76756bad CTestCoverageCollectGCOV: fix Cygwin test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76756bad6d6efb462f35bd687ca8bd348bff6960
commit 76756bad6d6efb462f35bd687ca8bd348bff6960
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Apr 6 15:50:26 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Apr 6 15:50:26 2016 -0400

    CTestCoverageCollectGCOV: fix Cygwin test
    
    Be more careful when comparing filepaths to see if they refer
    to the same file or not.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index ed21384..7df9666 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -215,8 +215,10 @@ function(ctest_coverage_collect_gcov)
       endif()
     endforeach()
 
+    get_filename_component(resolved_source_file "${source_file}" ABSOLUTE)
     foreach(uncovered_file IN LISTS uncovered_files)
-      if (uncovered_file STREQUAL source_file)
+      get_filename_component(resolved_uncovered_file "${uncovered_file}" ABSOLUTE)
+      if (resolved_uncovered_file STREQUAL resolved_source_file)
         list(REMOVE_ITEM uncovered_files "${uncovered_file}")
       endif()
     endforeach()

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

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


hooks/post-receive
-- 
CMake