diff options
author | dec05eba <dec05eba@protonmail.com> | 2017-12-13 19:58:58 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2017-12-13 19:59:04 +0100 |
commit | c244361b8ae743bcb326b9a1a168f2fdcab491e8 (patch) | |
tree | 0ffe9d11ebe2834546f5c4f916e2038c301bccff /src/PkgConfig.cpp | |
parent | 92f24893a5e2d12d0c32662483117c7032623bf1 (diff) |
Change linking order for pkg-config
Linking should be added in the order of dependencies.
Modified linking logic to check global lib dir if pkg-config
fails (missing package, pkg-config is not installed or any other reason),
also required for Windows.
Diffstat (limited to 'src/PkgConfig.cpp')
-rw-r--r-- | src/PkgConfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PkgConfig.cpp b/src/PkgConfig.cpp index 3307ff1..5f85549 100644 --- a/src/PkgConfig.cpp +++ b/src/PkgConfig.cpp @@ -89,15 +89,15 @@ namespace sibs return Result<bool>::Ok(true); } - Result<string> PkgConfig::getDynamicLibsLinkerFlags(const vector<string> &libs) + Result<string> PkgConfig::getDynamicLibsLinkerFlags(const vector<Dependency> &libs) { if(libs.empty()) return Result<string>::Ok(""); string args; - for(const string &lib : libs) + for(const Dependency &lib : libs) { args += " '"; - args += lib; + args += lib.name; args += "'"; } |