[Cmake-commits] CMake branch, next, updated. v3.1.0-2283-g7589b5f

[Bill Hoffman]

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  7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb (commit)
       via  d795a3d51274e6398da4ac59ee86943a5138f6d2 (commit)
      from  a75bb8377e228107917135b06a1af42aec1ecd52 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb
commit 7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb
Merge: a75bb83 d795a3d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jan 21 14:22:27 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 14:22:27 2015 -0500

    Merge topic 'cdash_upload_file_mode' into next
    
    d795a3d5 Only glob in the coverage dir for the gcov files instead of the whole tree.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d795a3d51274e6398da4ac59ee86943a5138f6d2
commit d795a3d51274e6398da4ac59ee86943a5138f6d2
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jan 21 14:15:23 2015 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Jan 21 14:15:23 2015 -0500

    Only glob in the coverage dir for the gcov files instead of the whole tree.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 3a9b421..f6616e0 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -126,7 +126,7 @@ function(ctest_coverage_collect_gcov)
 }")
   # collect the gcov files
   set(gcov_files)
-  file(GLOB_RECURSE gcov_files RELATIVE ${binary_dir} "${binary_dir}/*.gcov")
+  file(GLOB_RECURSE gcov_files RELATIVE ${binary_dir} "${coverage_dir}/*.gcov")
   # tar up the coverage info with the same date so that the md5
   # sum will be the same for the tar file independent of file time
   # stamps

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake