From c244361b8ae743bcb326b9a1a168f2fdcab491e8 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 13 Dec 2017 19:58:58 +0100 Subject: 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. --- src/PkgConfig.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/PkgConfig.cpp') 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::Ok(true); } - Result PkgConfig::getDynamicLibsLinkerFlags(const vector &libs) + Result PkgConfig::getDynamicLibsLinkerFlags(const vector &libs) { if(libs.empty()) return Result::Ok(""); string args; - for(const string &lib : libs) + for(const Dependency &lib : libs) { args += " '"; - args += lib; + args += lib.name; args += "'"; } -- cgit v1.2.3