[Cmake-commits] CMake branch, next, updated. v3.1.0-2264-g65af84b

[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  65af84b164be876c455e818d4342d6eec93833b5 (commit)
       via  fa90abc1783d5a65dbf4029aa60a1ec28e68b71e (commit)
      from  49dbd156c1c4ea2f7a97a6ba7821cba2595fe37c (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=65af84b164be876c455e818d4342d6eec93833b5
commit 65af84b164be876c455e818d4342d6eec93833b5
Merge: 49dbd15 fa90abc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 13:48:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 20 13:48:09 2015 -0500

    Merge topic 'cdash_upload_file_mode' into next
    
    fa90abc1 Collect the Lables.json files and update the documentation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa90abc1783d5a65dbf4029aa60a1ec28e68b71e
commit fa90abc1783d5a65dbf4029aa60a1ec28e68b71e
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jan 20 13:34:40 2015 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Jan 20 13:38:05 2015 -0500

    Collect the Lables.json files and update the documentation.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 34e5f9a..3a9b421 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -4,8 +4,12 @@
 #
 # This module provides the function ``ctest_coverage_collect_gcov``.
 # The function will run gcov on the .gcda files in a binary tree and then
-# package all of the .gcov files into a tar file with a data.json.
-# This file can be sent to a CDash server for display with the
+# package all of the .gcov files into a tar file with a data.json that
+# contains the source and build directories for CDash to use in parsing
+# the coverage data. In addtion the Labels.json files for targets that
+# have coverage information are also put in the tar file for CDash to
+# asign the correct labels. This file can be sent to a CDash server for
+# display with the
 # :command:`ctest_submit(CDASH_UPLOAD)` command.
 #
 # .. command:: cdash_coverage_collect_gcov
@@ -87,7 +91,7 @@ function(ctest_coverage_collect_gcov)
     # 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}
-        "${target_dir}/Labels.txt")
+        "${target_dir}/Labels.json")
       list(APPEND gcda_files ${gfiles})
       list(APPEND label_files ${lfiles})
     endif()

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

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


hooks/post-receive
-- 
CMake