aboutsummaryrefslogtreecommitdiff
path: root/build/config/utility
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-06-26 17:25:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-06-26 17:25:10 +0200
commit18568ff0ff3dce89d694b494c5dfc9a32e63c9e6 (patch)
treecd36895fdab3b30b8b61fcc3e12f8a92bb292203 /build/config/utility
parent95239b7c5404965d4f5ef997b5b75bf542a25192 (diff)
Part two of dependency injection with auto-generation support
Diffstat (limited to 'build/config/utility')
-rw-r--r--build/config/utility8
1 files changed, 5 insertions, 3 deletions
diff --git a/build/config/utility b/build/config/utility
index 403a91e..e59f0e5 100644
--- a/build/config/utility
+++ b/build/config/utility
@@ -53,11 +53,13 @@ namespace build
{
for (const name& n: val.template as<const list_value&> ())
{
- if (!n.simple ())
+ if (n.simple ())
+ args.push_back (n.value.c_str ());
+ else if (n.directory ())
+ args.push_back (n.dir.string ().c_str ());
+ else
fail << "expected option instead of " << n <<
info << "in variable " << var;
-
- args.push_back (n.value.c_str ());
}
}
}