[Cmake-commits] CMake branch, next, updated. v3.5.2-1013-g7915a62

[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  7915a626cf12b63db199f34834f743b8724de8ad (commit)
       via  5de122dfa4a1f60dae736d9f29e588cfd5ce0416 (commit)
       via  7d4c99a957b37e6905af3fe6ea96b7fdf2b8359c (commit)
      from  fd11289f48d52302cf433cfe2a800120a4766f35 (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=7915a626cf12b63db199f34834f743b8724de8ad
commit 7915a626cf12b63db199f34834f743b8724de8ad
Merge: fd11289 5de122d
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Apr 19 13:36:40 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 19 13:36:40 2016 -0400

    Merge topic 'coverage_collect_delete' into next
    
    5de122df CTestCoverageCollectGCOV: improve DELETE option
    7d4c99a9 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de122dfa4a1f60dae736d9f29e588cfd5ce0416
commit 5de122dfa4a1f60dae736d9f29e588cfd5ce0416
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Apr 19 13:19:10 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Apr 19 13:19:10 2016 -0400

    CTestCoverageCollectGCOV: improve DELETE option
    
    The DELETE option to ctest_coverage_collect_gcov now properly
    removes all the .gcov files that were created by this function.
    Previously it left behind any files that were excluded by
    CTEST_CUSTOM_COVERAGE_EXCLUDE.
    
    This option now also deletes the following files/directory that
    are created by ctest_coverage_collect_gcov:
      data.json
      coverage_file_list.txt
      the uncovered/ directory

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 31c4fef..a04d340 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -287,10 +287,14 @@ ${uncovered_files_for_tar}
     WORKING_DIRECTORY ${binary_dir})
 
   if (GCOV_DELETE)
-    string(REPLACE "\n" ";" gcov_files "${gcov_files}")
-    foreach(gcov_file ${gcov_files})
+    foreach(gcov_file ${unfiltered_gcov_files})
       file(REMOVE ${binary_dir}/${gcov_file})
     endforeach()
+    file(REMOVE ${coverage_dir}/coverage_file_list.txt)
+    file(REMOVE ${coverage_dir}/data.json)
+    if (EXISTS ${binary_dir}/uncovered)
+      file(REMOVE ${binary_dir}/uncovered)
+    endif()
   endif()
 
 endfunction()

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

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


hooks/post-receive
-- 
CMake