Support boolean logic in conditions

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index d23e1b3d1cc34825250b44b81570094514c69682..fa6fd5670a5e1cf56251224e7aaf7b80279f02ed 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -4,6 +4,7 @@
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
+#include "booleanevaluator.h"
 #include "builder.h"
 #include "component.h"
 #include "csourcefile.h"
@@ -348,7 +349,8 @@ void Component::Loader::if_arch(const string &cond)
 
 void Component::Loader::if_feature(const string &cond)
 {
-       bool match = obj.package.match_feature(cond);
+       BooleanEvaluator eval(sigc::mem_fun(&obj.package, &SourcePackage::match_feature));
+       bool match = eval.evaluate(cond);
        obj.package.get_builder().get_logger().log("configure",
                format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
        if(match)