kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Zack Galbreath 2016-04-04 14:04:35 -04:00
parent ff6211e635
commit c5ff34cc47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CTestCoverageCollectGCOV.cmake
View File

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