From 5de122dfa4a1f60dae736d9f29e588cfd5ce0416 Mon Sep 17 00:00:00 2001
From: Zack Galbreath <zack.galbreath@kitware.com>
Date: Tue, 19 Apr 2016 13:19:10 -0400
Subject: [PATCH] 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
---
 Modules/CTestCoverageCollectGCOV.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 31c4fef93..a04d340cf 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()