From 6a4368431e645392c79cb8458bf15e1a02ba8481 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 5 Sep 2016 16:56:35 +0200 Subject: Update to latest build2 changes --- build/bootstrap.build | 2 +- hello/buildfile | 2 +- manifest | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/bootstrap.build b/build/bootstrap.build index 64a93f2..0aa6b53 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -1,6 +1,6 @@ project = libhello -using build@0.4.0-a1 +using build@0.4.0 version = 1.1.0 abi_major = 1 diff --git a/hello/buildfile b/hello/buildfile index 8807f1b..a712474 100644 --- a/hello/buildfile +++ b/hello/buildfile @@ -11,7 +11,7 @@ if $abi_prerelease else lib{hello}: bin.lib.version = @-$abi_major.$abi_minor -cxx.poptions += -I$src_root +cxx.poptions =+ -I$src_root obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD diff --git a/manifest b/manifest index db53350..5e0739d 100644 --- a/manifest +++ b/manifest @@ -11,6 +11,7 @@ goal is to show a canonical build2/bpkg project/package. url: http://www.example.org/libhello email: hello-users@example.org requires: c++11 -requires: build2 >= 0.4.0 +depends: * build2 >= 0.4.0 +depends: * bpkg >= 0.4.0 depends: libformat [1.0.0 2.0.0-); compatible with libformat-1.X.Y depends: libprint [1.0.0 2.0.0-); compatible with libprint-1.X.Y -- cgit v1.1