From: Mikko Rasa Date: Sat, 22 Jun 2013 08:45:06 +0000 (+0300) Subject: Process paths after merging build info X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=71554f76b7ae8f1f9d183dc0c522655ce458cb78;p=builder.git Process paths after merging build info --- diff --git a/source/component.cpp b/source/component.cpp index 5e918c8..5f50a65 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -59,15 +59,14 @@ void Component::create_build_info() } final_build_info.update_from(package.get_build_info()); + final_build_info.update_from(build_info); + build_info = final_build_info; for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) *i = (package.get_source_directory() / *i).str(); for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) *i = (package.get_source_directory() / *i).str(); - final_build_info.update_from(build_info); - build_info = final_build_info; - for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) { /* Select an include path that contains all the sources for this and the