From c5ff34cc4703ee296b4bcf8a8ac17e1a9046af26 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Mon, 4 Apr 2016 14:04:35 -0400 Subject: 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. --- Modules/CTestCoverageCollectGCOV.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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() -- cgit v0.12