From 402bb6e6b297614226c4f848ebdb13fd49a95d76 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 7 Jul 2015 13:00:45 +0200
Subject: Relax requirement on amalgamation src_root to track sub-project

---
 tests/cli/lib/libtest/build/root.build | 1 -
 tests/cli/lib/test/buildfile           | 2 +-
 tests/cli/simple/build/root.build      | 2 --
 tests/cli/simple/buildfile             | 6 +++++-
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests/cli')

diff --git a/tests/cli/lib/libtest/build/root.build b/tests/cli/lib/libtest/build/root.build
index 4dce48b..f8d3d9e 100644
--- a/tests/cli/lib/libtest/build/root.build
+++ b/tests/cli/lib/libtest/build/root.build
@@ -3,4 +3,3 @@ using cxx
 hxx.ext =
 ixx.ext = ipp
 cxx.ext = cpp
-
diff --git a/tests/cli/lib/test/buildfile b/tests/cli/lib/test/buildfile
index 70a4dc1..0bbeb95 100644
--- a/tests/cli/lib/test/buildfile
+++ b/tests/cli/lib/test/buildfile
@@ -3,4 +3,4 @@ import libs += cli-lib-libtest
 exe{driver}: cxx{driver} cli.cxx{test} $libs
 cli.cxx{test}: cli{test}
 
-cxx.poptions = -I$out_root
+cxx.poptions += -I$out_root
diff --git a/tests/cli/simple/build/root.build b/tests/cli/simple/build/root.build
index 8e910cf..8b13789 100644
--- a/tests/cli/simple/build/root.build
+++ b/tests/cli/simple/build/root.build
@@ -1,3 +1 @@
-using cxx
-using cli
 
diff --git a/tests/cli/simple/buildfile b/tests/cli/simple/buildfile
index 80882c6..998eb67 100644
--- a/tests/cli/simple/buildfile
+++ b/tests/cli/simple/buildfile
@@ -1,8 +1,12 @@
+using cxx
+
 hxx.ext =
 cxx.ext = cpp
 ixx.ext = ipp
 
-cxx.poptions = -I$out_root
+cxx.poptions += -I$out_root
+
+using cli
 
 exe{driver}: cxx{driver} cxx{test}
 cxx{test} hxx{test}: cli{test}
-- 
cgit v1.1