diff options
author | dec05eba <dec05eba@protonmail.com> | 2018-01-14 18:36:20 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2018-01-26 09:13:15 +0100 |
commit | 91ab79f1475371e6e57d00f24f98bccb7749d15a (patch) | |
tree | 40fa847c783ecdc165ad1fc6b7c5cd2a026d25b9 /src/PkgConfig.cpp | |
parent | b7b7b3d359765e3ffb011dc34ff928e614766666 (diff) |
Add git dependencies
Diffstat (limited to 'src/PkgConfig.cpp')
-rw-r--r-- | src/PkgConfig.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/PkgConfig.cpp b/src/PkgConfig.cpp index 9a19387..42d0d13 100644 --- a/src/PkgConfig.cpp +++ b/src/PkgConfig.cpp @@ -1,6 +1,7 @@ #include "../include/PkgConfig.hpp" #if OS_FAMILY == OS_FAMILY_POSIX #include "../include/Exec.hpp" +#include "../include/Dependency.hpp" using namespace std; @@ -19,20 +20,18 @@ namespace sibs return ""; } -#if OS_FAMILY == OS_FAMILY_POSIX - Result<bool> PkgConfig::validatePkgConfigPackageVersionExists(const Dependency &dependency) + Result<bool> PkgConfig::validatePkgConfigPackageVersionExists(PackageListDependency *dependency) { - Result<bool> dependencyValidationResult = PkgConfig::validatePackageExists(dependency.name); + Result<bool> dependencyValidationResult = PkgConfig::validatePackageExists(dependency->name); if(dependencyValidationResult.isErr()) return Result<bool>::Err(dependencyValidationResult.getErrMsg()); - Result<bool> dependencyVersionValidationResult = PkgConfig::validatePackageVersionAtLeast(dependency.name, dependency.version); + Result<bool> dependencyVersionValidationResult = PkgConfig::validatePackageVersionAtLeast(dependency->name, dependency->version); if(dependencyVersionValidationResult.isErr()) return Result<bool>::Err(dependencyVersionValidationResult.getErrMsg()); return Result<bool>::Ok(true); } -#endif Result<bool> PkgConfig::validatePackageExists(const string &name) { @@ -101,15 +100,15 @@ namespace sibs return Result<bool>::Ok(true); } - Result<string> PkgConfig::getDynamicLibsLinkerFlags(const vector<Dependency> &libs) + Result<string> PkgConfig::getDynamicLibsLinkerFlags(const vector<PackageListDependency*> &libs) { if(libs.empty()) return Result<string>::Ok(""); string args; - for(const Dependency &lib : libs) + for(PackageListDependency *lib : libs) { args += " '"; - args += lib.name; + args += lib->name; args += "'"; } @@ -144,15 +143,15 @@ namespace sibs } } - Result<string> PkgConfig::getDynamicLibsCflags(const vector<Dependency> &libs) + Result<string> PkgConfig::getDynamicLibsCflags(const vector<PackageListDependency*> &libs) { if(libs.empty()) return Result<string>::Ok(""); string args; - for(const Dependency &lib : libs) + for(PackageListDependency *lib : libs) { args += " '"; - args += lib.name; + args += lib->name; args += "'"; } @@ -187,7 +186,7 @@ namespace sibs } } - Result<PkgConfigFlags> PkgConfig::getDynamicLibsFlags(const vector<Dependency> &libs) + Result<PkgConfigFlags> PkgConfig::getDynamicLibsFlags(const vector<PackageListDependency*> &libs) { PkgConfigFlags flags; |