From 91ab79f1475371e6e57d00f24f98bccb7749d15a Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 14 Jan 2018 18:36:20 +0100
Subject: Add git dependencies

---
 src/PkgConfig.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/PkgConfig.cpp')

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;
         
-- 
cgit v1.2.3