diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-31 11:28:44 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-31 11:28:44 +0200 |
| commit | b2b169b6a5d92bb662637721a2bafa73d88bce35 (patch) | |
| tree | c801439f4872fb5ba9154855b6d7e4762eec510d | |
| parent | 22f3ffe90badb381c07e943b65aca9bde4911992 (diff) | |
build2 build system fixes
| -rw-r--r-- | build/root.build | 4 | ||||
| -rw-r--r-- | buildfile | 3 | ||||
| -rw-r--r-- | odb/sqlite/buildfile | 8 | ||||
| -rw-r--r-- | tests/basics/buildfile | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/build/root.build b/build/root.build index 174f292..fb0de84 100644 --- a/build/root.build +++ b/build/root.build @@ -2,8 +2,6 @@ # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file -using cxx - cxx.std = 11 -tests/: install = false # Don't install tests. +using cxx @@ -6,4 +6,7 @@ d = odb/sqlite/ tests/ ./: $d doc{GPLv2 INSTALL LICENSE NEWS README version} file{manifest} include $d +# Don't install tests or the INSTALL file. +# +dir{tests/}: install = false doc{INSTALL}@./: install = false diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile index 9fb6615..d5f1d13 100644 --- a/odb/sqlite/buildfile +++ b/odb/sqlite/buildfile @@ -2,8 +2,8 @@ # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file -import libs = libsqlite3%lib{sqlite3} -import libs += libodb%lib{odb} +import int_libs = libodb%lib{odb} +import int_libs += libsqlite3%lib{sqlite3} lib{odb-sqlite}: \ {hxx }{ auto-handle } \ @@ -49,7 +49,7 @@ lib{odb-sqlite}: \ details/{hxx ixx cxx}{ options } \ details/build2/{h }{ config } \ details/build2/{h }{ config-vc } \ - $libs + $int_libs cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_SQLITE_BUILD2 obja{*}: cxx.poptions += -DLIBODB_SQLITE_STATIC_BUILD @@ -59,6 +59,8 @@ lib{odb-sqlite}: cxx.export.poptions = -I$src_root -DLIBODB_SQLITE_BUILD2 liba{odb-sqlite}: cxx.export.poptions += -DLIBODB_SQLITE_STATIC libs{odb-sqlite}: cxx.export.poptions += -DLIBODB_SQLITE_SHARED +lib{odb-sqlite}: cxx.export.libs = $int_libs + # 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/tests/basics/buildfile b/tests/basics/buildfile index 833a7c8..606b450 100644 --- a/tests/basics/buildfile +++ b/tests/basics/buildfile @@ -2,7 +2,6 @@ # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file -import libs = libodb%lib{odb} # @@ -import libs += libodb-sqlite%lib{odb-sqlite} +import libs = libodb-sqlite%lib{odb-sqlite} exe{driver}: cxx{driver} $libs |