[Cmake-commits] CMake branch, next, updated. v3.5.1-800-gfe70832

[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  fe7083245d8fb195238940742fbe81945f92b70f (commit)
       via  c5ff34cc4703ee296b4bcf8a8ac17e1a9046af26 (commit)
       via  ff6211e6358a1c7ea6dff9a37cb8ac24308df5d7 (commit)
       via  2e8837d00dead67df26b79fdbd3d0e2923f66dcd (commit)
       via  228801b9c823b7d992964d11a272896c4718115c (commit)
      from  7c431319ee54b9764bc7224196ec3678122cbc13 (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=fe7083245d8fb195238940742fbe81945f92b70f
commit fe7083245d8fb195238940742fbe81945f92b70f
Merge: 7c43131 c5ff34c
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Apr 4 14:12:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 4 14:12:11 2016 -0400

    Merge topic 'branch_coverage_working_dir' into next
    
    c5ff34cc CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
    ff6211e6 CMake Nightly Date Stamp
    2e8837d0 CMake Nightly Date Stamp
    228801b9 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5ff34cc4703ee296b4bcf8a8ac17e1a9046af26
commit c5ff34cc4703ee296b4bcf8a8ac17e1a9046af26
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Apr 4 14:04:35 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Mon Apr 4 14:04:35 2016 -0400

    CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
    
    Consistently glob for .gcda files in the binary directory.
    Previously the behavior of this function depended on the
    current working directory that it was called from.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index f31e432..54c53d2 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -99,11 +99,11 @@ function(ctest_coverage_collect_gcov)
   set(gcda_files)
   set(label_files)
   if (GCOV_GLOB)
-      file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "*.gcda")
+      file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${binary_dir}/*.gcda")
       list(LENGTH gfiles len)
       # if we have gcda files then also grab the labels file for that target
       if(${len} GREATER 0)
-        file(GLOB_RECURSE lfiles RELATIVE ${binary_dir} "Labels.json")
+        file(GLOB_RECURSE lfiles RELATIVE ${binary_dir} "${binary_dir}/Labels.json")
         list(APPEND gcda_files ${gfiles})
         list(APPEND label_files ${lfiles})
       endif()

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake |    4 ++--
 Source/CMakeVersion.cmake              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake