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

cmDepends: No dependency-vector erasure in CheckDependencies 

Some dependency-generators (such as cmDependsFortran) generate multiple
entries per depender, so erasing the dependency vector for each depender
found loses earlier dependencies.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
This commit is contained in:
Michael Wild 2009-12-14 18:06:51 +01:00 committed by Brad King
parent e74ff7c29f
commit c66f03adf9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmDepends.cxx
View File

@ -181,8 +181,10 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
// kdelibs/khtml this reduces the number of calls from 184k down to 92k, // kdelibs/khtml this reduces the number of calls from 184k down to 92k,
// or the time for cmake -E cmake_depends from 0.3 s down to 0.21 s. // or the time for cmake -E cmake_depends from 0.3 s down to 0.21 s.
dependerExists = cmSystemTools::FileExists(this->Depender); dependerExists = cmSystemTools::FileExists(this->Depender);
DependencyVector tmp; // If we erase validDeps[this->Depender] by overwriting it with an empty
validDeps[this->Depender] = tmp; // vector, we lose dependencies for dependers that have multiple
// entries. No need to initialize the entry, std::map will do so on first
// access.
currentDependencies = &validDeps[this->Depender]; currentDependencies = &validDeps[this->Depender];
continue; continue;
} }