Also prepare transitive dependencies

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 12fcac5286558e0963b97032842076c3f5feb012..5ea1b344069c034c07636b3e0a848b05fe64b9b7 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -36,6 +36,14 @@ BuildInfo::BuildInfo():
        fatal_warnings(false)
 { }
 
+BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
+{
+       LibModeMap::const_iterator i = libmodes.find(lib);
+       if(i!=libmodes.end())
+               return i->second;
+       return libmode;
+}
+
 void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
        for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
@@ -49,7 +57,10 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
        threads = bi.threads;
        if(level==LOCAL)
        {
+               local_incpath.insert(local_incpath.end(), bi.local_incpath.begin(), bi.local_incpath.end());
                libmode = bi.libmode;
+               for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
+                       libmodes[i->first] = i->second;
                debug = bi.debug;
                optimize = bi.optimize;
                strip = bi.strip;
@@ -57,14 +68,9 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
                fatal_warnings = bi.fatal_warnings;
        }
 
-       unique();
-}
-
-void BuildInfo::unique()
-{
-       ::unique(incpath);
-       ::unique(libpath);
-       ::unique(libs);
+       unique(incpath);
+       unique(libpath);
+       unique(libs);
 }
 
 
@@ -77,6 +83,8 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        add("libpath",  &Loader::libpath);
        add("library",  &Loader::library);
        add("libmode",  &BuildInfo::libmode);
+       add("libmode",  &Loader::libmode_for_lib);
+       add("local_incpath", &Loader::local_incpath);
        add("optimize", &BuildInfo::optimize);
        add("strip",    &BuildInfo::strip);
        add("threads",  &BuildInfo::threads);
@@ -94,6 +102,11 @@ void BuildInfo::Loader::define(const string &d, const string &v)
        obj.defines[d] = v;
 }
 
+void BuildInfo::Loader::libmode_for_lib(const string &l, LibraryMode m)
+{
+       obj.libmodes[l] = m;
+}
+
 void BuildInfo::Loader::libpath(const string &s)
 {
        obj.libpath.push_back(s);
@@ -104,8 +117,13 @@ void BuildInfo::Loader::library(const string &s)
        obj.libs.push_back(s);
 }
 
+void BuildInfo::Loader::local_incpath(const string &s)
+{
+       obj.local_incpath.push_back(s);
+}
+
 
-void operator>>(LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
+void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {
        if(conv.get()=="FORCE_STATIC")
                libmode = BuildInfo::FORCE_STATIC;