diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-30 15:53:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-06 16:54:39 (GMT) |
| commit | e74ff7c29fc764af63ed3f5195ecc64730c07939 (patch) | |
| tree | 9aca0b2d414e299638ecc803dddc7c6d438e9749 /Source/cmDependsJava.h | |
| parent | ecc77d09b8996b59bf22bc36e06fa4bb52d665ee (diff) | |
| download | CMake-e74ff7c29fc764af63ed3f5195ecc64730c07939.zip CMake-e74ff7c29fc764af63ed3f5195ecc64730c07939.tar.gz CMake-e74ff7c29fc764af63ed3f5195ecc64730c07939.tar.bz2 | |
cmDepends: allow multiple dependees per depender
This patch is heavily inspired by Michael Wild.
The interfaces cmDepends::Write and cmDepends::WriteDependencies where
extended to allow multiple dependees (sources) per depender (object).
cmDepends::Write first collect all dependencies into a std::set before
passing it to cmDepends::WriteDependencies.
cmDependsC::WriteDependencies also first collects all explicit and
implicit dependencies into a std::set and only then writes
depend.{internal,make}. The implementation of cmDependsFortran simply
loops over all sources and proceeds as before, whereas the cmDependsJava
implementation is as trivial as before.
This is for preventing exponential growth of depend.{internal,make} in
the next commit which fixes dependency-vector erasure in
cmDepends::CheckDependencies.
Inspired-by: Michael Wild <themiwi@users.sourceforge.net>
Diffstat (limited to 'Source/cmDependsJava.h')
| -rw-r--r-- | Source/cmDependsJava.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h index bf7e234..22af53f 100644 --- a/Source/cmDependsJava.h +++ b/Source/cmDependsJava.h @@ -29,7 +29,8 @@ public: protected: // Implement writing/checking methods required by superclass. - virtual bool WriteDependencies(const char *src, const char *file, + virtual bool WriteDependencies( + const std::set<std::string>& sources, const std::string& file, std::ostream& makeDepends, std::ostream& internalDepends); virtual bool CheckDependencies(std::istream& internalDepends, const char* internalDependsFileName, |