ENH: Add support for the new gcc that uses files with extension .gcda
This commit is contained in:
parent
e3d4eb3715
commit
6479f4db32
|
@ -186,7 +186,6 @@ int cmCTestCoverageHandler::ProcessHandler()
|
||||||
|
|
||||||
std::string asfGlob = sourceDir + "/*";
|
std::string asfGlob = sourceDir + "/*";
|
||||||
std::string abfGlob = binaryDir + "/*";
|
std::string abfGlob = binaryDir + "/*";
|
||||||
std::string daGlob = binaryDir + "/*.da";
|
|
||||||
|
|
||||||
|
|
||||||
// Style 1
|
// Style 1
|
||||||
|
@ -222,8 +221,13 @@ int cmCTestCoverageHandler::ProcessHandler()
|
||||||
|
|
||||||
cmGlob gl;
|
cmGlob gl;
|
||||||
gl.RecurseOn();
|
gl.RecurseOn();
|
||||||
|
std::string daGlob = binaryDir + "/*.da";
|
||||||
gl.FindFiles(daGlob);
|
gl.FindFiles(daGlob);
|
||||||
std::vector<std::string> files = gl.GetFiles();
|
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;
|
std::vector<std::string>::iterator it;
|
||||||
|
|
||||||
if ( files.size() == 0 )
|
if ( files.size() == 0 )
|
||||||
|
|
Loading…
Reference in New Issue