From 3728e358f92d25434163b5bb58b7623950a8738d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 5 Dec 2016 17:45:33 +0300
Subject: Adapt buildfiles to expansion change

---
 build/root.build            | 2 +-
 examples/features/buildfile | 2 +-
 examples/file/buildfile     | 2 +-
 examples/hello/buildfile    | 2 +-
 tests/ctor/buildfile        | 2 +-
 tests/erase/buildfile       | 2 +-
 tests/file/buildfile        | 2 +-
 tests/inheritance/buildfile | 2 +-
 tests/specifier/buildfile   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/root.build b/build/root.build
index fd29507..aa1de2b 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,7 +11,7 @@ ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
 
-cxx.poptions =+ -I$out_root -I$src_root
+cxx.poptions =+ "-I$out_root" "-I$src_root"
 
 # Load the cli module but only if it's available. This way a distribution
 # that includes pre-generated files can be built without installing cli.
diff --git a/examples/features/buildfile b/examples/features/buildfile
index 3b7b1dc..7778847 100644
--- a/examples/features/buildfile
+++ b/examples/features/buildfile
@@ -4,7 +4,7 @@
 
 exe{driver}: cxx{driver} {hxx ixx cxx}{options} doc{README}
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/examples/file/buildfile b/examples/file/buildfile
index d26a9d6..928b949 100644
--- a/examples/file/buildfile
+++ b/examples/file/buildfile
@@ -5,7 +5,7 @@
 exe{driver}: cxx{driver} {hxx ixx cxx}{options} doc{README} file{test.ops}
 exe{driver}: test.arguments = --options-file $src_base/test.ops
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/examples/hello/buildfile b/examples/hello/buildfile
index f45001d..c6032d0 100644
--- a/examples/hello/buildfile
+++ b/examples/hello/buildfile
@@ -5,7 +5,7 @@
 exe{driver}: cxx{driver} {hxx ixx cxx}{hello} doc{README}
 exe{driver}: test.arguments = --greeting Hi John Jane
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/tests/ctor/buildfile b/tests/ctor/buildfile
index ce0dc03..d7af18e 100644
--- a/tests/ctor/buildfile
+++ b/tests/ctor/buildfile
@@ -4,7 +4,7 @@
 
 exe{driver}: cxx{driver} {hxx ixx cxx}{test}
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/tests/erase/buildfile b/tests/erase/buildfile
index 887c9d9..f6decf9 100644
--- a/tests/erase/buildfile
+++ b/tests/erase/buildfile
@@ -5,7 +5,7 @@
 exe{driver}: cxx{driver} {hxx ixx cxx}{test}
 exe{driver}: test.arguments = foo -a bar -b 123 --arg -- -b 234
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/tests/file/buildfile b/tests/file/buildfile
index 08e1017..2e0eea9 100644
--- a/tests/file/buildfile
+++ b/tests/file/buildfile
@@ -4,7 +4,7 @@
 
 exe{driver}: cxx{driver} {hxx ixx cxx}{test} test{testscript}
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/tests/inheritance/buildfile b/tests/inheritance/buildfile
index 0f8bbcb..49fbcb6 100644
--- a/tests/inheritance/buildfile
+++ b/tests/inheritance/buildfile
@@ -6,7 +6,7 @@ exe{driver}: cxx{driver} {hxx ixx cxx}{test}
 exe{driver}: test.arguments = --very-long-flag -s short -i 123 --string long
 exe{driver}: test.output = test.std
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
diff --git a/tests/specifier/buildfile b/tests/specifier/buildfile
index 3d11b0d..cc641b9 100644
--- a/tests/specifier/buildfile
+++ b/tests/specifier/buildfile
@@ -5,7 +5,7 @@
 exe{driver}: cxx{driver} {hxx ixx cxx}{test}
 exe{driver}: test.arguments = -a -c foo
 
-cxx.poptions =+ -I$out_base
+cxx.poptions =+ "-I$out_base"
 
 # Generated options parser.
 #
-- 
cgit v1.1