From 13ccdf9411e276d707b643bbe490bf1a4959b092 Mon Sep 17 00:00:00 2001 From: tpoole Date: Wed, 11 Oct 2017 11:10:48 +0100 Subject: [PATCH] Projucer: Added more thorough checking of pkg-config dependencies --- .../ProjectSaving/jucer_ProjectExport_Make.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h index 108c805897..2b69ae1461 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h @@ -683,18 +683,14 @@ private: out << getPhonyTargetLine() << newLine << newLine; - StringArray packages; - packages.addTokens (getExtraPkgConfigString(), " ", "\"'"); - packages.removeEmptyStrings(); + auto packages = getPackages(); - const bool useLinuxPackages = (linuxPackages.size() > 0 || packages.size() > 0); - - writeTargetLines (out, useLinuxPackages); + writeTargetLines (out, ! packages.isEmpty()); for (auto target : targets) target->addFiles (out); - if (useLinuxPackages) + if (! packages.isEmpty()) { out << "check-pkg-config:" << newLine << "\t@command -v pkg-config >/dev/null 2>&1 || " @@ -702,11 +698,8 @@ private: "exit 1; }" << newLine << "\t@pkg-config --print-errors"; - for (int i = 0; i < linuxPackages.size(); ++i) - out << " " << linuxPackages[i]; - - for (int i = 0; i < packages.size(); ++i) - out << " " << packages[i]; + for (auto& pkg : packages) + out << " " << pkg; out << newLine << newLine; }