diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-06-18 10:13:48 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-06-18 10:16:44 +0200 |
| commit | fb5bab834df474f5fa7c09f137aa375b5bca4718 (patch) | |
| tree | ef71376a650860c4fb3219292984c258e038a641 | |
| parent | 95c4c20586a56fd8b8d32043d85c20f2c164474d (diff) | |
Move cxx.poptions setting from root.build to bpkg/buildfile
That's the new recommended way.
Also get rid of the library chain workaround that is no longer
necessary with latest build2.
| -rw-r--r-- | bpkg/buildfile | 1 | ||||
| -rw-r--r-- | build/root.build | 1 | ||||
| -rw-r--r-- | tests/manifest/buildfile | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/bpkg/buildfile b/bpkg/buildfile index b084404..d887750 100644 --- a/bpkg/buildfile +++ b/bpkg/buildfile @@ -4,4 +4,5 @@ import libs += libbutl lib{bpkg}: cxx{manifest-parser manifest-serializer manifest} $libs +cxx.poptions += -I$src_root lib{bpkg}: cxx.export.poptions = -I$src_root diff --git a/build/root.build b/build/root.build index dc1c297..1361f7b 100644 --- a/build/root.build +++ b/build/root.build @@ -5,4 +5,3 @@ using cxx cxx.std = 14 -cxx.poptions += -I$src_root diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index ee23ca9..8b2082b 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -2,9 +2,7 @@ # copyright : Copyright (c) 2014-2015 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl #@@ hack to get -I - -exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs +exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} include ../../bpkg/ |