diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-07 12:57:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-07 12:57:45 (GMT) |
| commit | 82c405c4737236ac0c954134d9cbc815823e2409 (patch) | |
| tree | a91de3614543c83330ff45501cbe2951bd035fa5 /Modules/CTestCoverageCollectGCOV.cmake | |
| parent | 7d5a0f5f60b9ba60c90a43c42f157c658319e6ef (diff) | |
| parent | c5ff34cc4703ee296b4bcf8a8ac17e1a9046af26 (diff) | |
| download | CMake-82c405c4737236ac0c954134d9cbc815823e2409.zip CMake-82c405c4737236ac0c954134d9cbc815823e2409.tar.gz CMake-82c405c4737236ac0c954134d9cbc815823e2409.tar.bz2 | |
Merge topic 'branch_coverage_working_dir'
c5ff34cc CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
Diffstat (limited to 'Modules/CTestCoverageCollectGCOV.cmake')
| -rw-r--r-- | Modules/CTestCoverageCollectGCOV.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake index 7df9666..31c4fef 100644 --- a/Modules/CTestCoverageCollectGCOV.cmake +++ b/Modules/CTestCoverageCollectGCOV.cmake @@ -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() |