aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-16 10:47:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-16 10:47:15 +0200
commite6e9035b763906eaedeaf2138dfef99fc02a64fe (patch)
treee75ebf93ecbe163af149284ebdc44f92e4068670
parent9bc7e449358d4cae61c5e9636678ed739e5ec6c4 (diff)
Incorporate new submodules into build system
-rw-r--r--build/bootstrap.build4
-rw-r--r--build/root.build1
-rw-r--r--buildfile2
3 files changed, 4 insertions, 3 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 5b4e9b3..dfab993 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -4,9 +4,9 @@
project = build2-toolchain
version = 0.4.0-a1
-subprojects = libbutl build2 libbpkg bpkg
+subprojects = libbutl build2 libsqlite3 libodb libodb-sqlite libbpkg bpkg
-using build@0.3.0
+using build@0.4.0-a1
using config
using dist
using test # Note: needed for dist to work in subprojects with tests.
diff --git a/build/root.build b/build/root.build
index 13128e0..927ee64 100644
--- a/build/root.build
+++ b/build/root.build
@@ -6,4 +6,5 @@
# common configuration.
#
using cxx
+using c
using? cli
diff --git a/buildfile b/buildfile
index 3a3d3fc..13c59c5 100644
--- a/buildfile
+++ b/buildfile
@@ -2,7 +2,7 @@
# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-d = libbutl/ build2/ libbpkg/ bpkg/ doc/
+d = libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/
./: $d doc{INSTALL README version} file{INSTALL.cli}
include $d