Merge topic 'branch_coverage_working_dir'
c5ff34cc CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
This commit is contained in:
commit
82c405c473
@ -104,11 +104,11 @@ function(ctest_coverage_collect_gcov)
|
|||||||
set(gcda_files)
|
set(gcda_files)
|
||||||
set(label_files)
|
set(label_files)
|
||||||
if (GCOV_GLOB)
|
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)
|
list(LENGTH gfiles len)
|
||||||
# if we have gcda files then also grab the labels file for that target
|
# if we have gcda files then also grab the labels file for that target
|
||||||
if(${len} GREATER 0)
|
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 gcda_files ${gfiles})
|
||||||
list(APPEND label_files ${lfiles})
|
list(APPEND label_files ${lfiles})
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user