summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-08-03 15:56:00 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-08-03 15:56:00 (GMT)
commit6479f4db32aca1b6ceff985199d0da2904af347e (patch)
tree1201913bd61b996995b120d189942b81dff34ccf /Source/CTest
parente3d4eb371518cb0ce543ecb519469afddd18541c (diff)
downloadCMake-6479f4db32aca1b6ceff985199d0da2904af347e.zip
CMake-6479f4db32aca1b6ceff985199d0da2904af347e.tar.gz
CMake-6479f4db32aca1b6ceff985199d0da2904af347e.tar.bz2
ENH: Add support for the new gcc that uses files with extension .gcda
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 9deb0fe..e542a4d 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -186,7 +186,6 @@ int cmCTestCoverageHandler::ProcessHandler()
std::string asfGlob = sourceDir + "/*";
std::string abfGlob = binaryDir + "/*";
- std::string daGlob = binaryDir + "/*.da";
// Style 1
@@ -222,8 +221,13 @@ int cmCTestCoverageHandler::ProcessHandler()
cmGlob gl;
gl.RecurseOn();
+ std::string daGlob = binaryDir + "/*.da";
gl.FindFiles(daGlob);
std::vector<std::string> files = gl.GetFiles();
+ daGlob = binaryDir + "/*.gcda";
+ gl.FindFiles(daGlob);
+ std::vector<std::string>& moreFiles = gl.GetFiles();
+ files.insert(files.end(), moreFiles.begin(), moreFiles.end());
std::vector<std::string>::iterator it;
if ( files.size() == 0 )