Merge topic 'branch_coverage_working_dir'

c5ff34cc CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
This commit is contained in:
Brad King 2016-04-07 08:57:45 -04:00 committed by CMake Topic Stage
commit 82c405c473
1 changed files with 2 additions and 2 deletions

View File

@ -104,11 +104,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()