mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Makefiles dependencies: enhance robustness of deps parser

Browse Source
This commit is contained in:
Marc Chevrier
2020-12-02 12:29:31 +01:00
parent 8bdde2b161
commit f395caf498
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmDependsCompiler.cxx
View File

@@ -182,6 +182,11 @@ bool cmDependsCompiler::CheckDependencies(
ParseLine(line, depends); ParseLine(line, depends);
} }
if (depends.empty()) {
// unexpectedly empty, ignore it and continue
continue;
}
// depending of the effective format of the dependencies file generated // depending of the effective format of the dependencies file generated
// by the compiler, the target can be wrongly identified as a // by the compiler, the target can be wrongly identified as a
// dependency so remove it from the list // dependency so remove it from the list
@@ -189,7 +194,13 @@ bool cmDependsCompiler::CheckDependencies(
depends.erase(depends.begin()); depends.erase(depends.begin());
} }
if (isValidPath) { // ensure source file is the first dependency
if (depends.front() != source) {
cm::erase(depends, source);
if (!isValidPath) {
depends.insert(depends.begin(), source);
}
} else if (isValidPath) {
// remove first dependency because it must not be filtered out // remove first dependency because it must not be filtered out
depends.erase(depends.begin()); depends.erase(depends.begin());
} }