]> git.tdb.fi Git - builder.git/commitdiff
Improve use statement handling
authorMikko Rasa <tdb@tdb.fi>
Tue, 29 Jan 2013 17:21:52 +0000 (19:21 +0200)
committerMikko Rasa <tdb@tdb.fi>
Tue, 29 Jan 2013 17:21:52 +0000 (19:21 +0200)
Installed libraries are now linked dynamically.  For non-installed
libraries, the package source path is added to libpath so the library
will be found.

source/component.cpp

index 9ffbbf398feb11d7ec5c6f83c54ff9c046a69c30..68c9b1800097ad6ef014ae5b5a86122e52d392cf 100644 (file)
@@ -80,7 +80,11 @@ void Component::create_build_info()
                        base = FS::common_ancestor(base, *j);
                build_info.incpath.push_back(base);
                build_info.libs.push_back((*i)->get_name());
-               build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+               if(!(*i)->get_install())
+               {
+                   build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+                       build_info.libpath.push_back((*i)->get_package().get_source_directory());
+               }
        }
 
        if(type==LIBRARY || type==MODULE)