aboutsummaryrefslogtreecommitdiff
path: root/odb/sqlite
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2016-08-31 19:27:53 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2016-08-31 19:27:53 +0300
commit39c76ef8c9b664c94d5d7b789457fa4045fdce04 (patch)
treeeb637b473fa4f5faa41de8e4a422a977f04b2960 /odb/sqlite
parentb2b169b6a5d92bb662637721a2bafa73d88bce35 (diff)
Build infrastructure update
Diffstat (limited to 'odb/sqlite')
-rw-r--r--odb/sqlite/buildfile21
-rw-r--r--odb/sqlite/details/.gitignore1
2 files changed, 10 insertions, 12 deletions
diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile
index d5f1d13..d32d3b4 100644
--- a/odb/sqlite/buildfile
+++ b/odb/sqlite/buildfile
@@ -51,7 +51,15 @@ details/build2/{h }{ config } \
details/build2/{h }{ config-vc } \
$int_libs
-cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_SQLITE_BUILD2
+# For pre-releases use the complete version to make sure they cannot be used
+# in place of another pre-release or the final version.
+#
+if $abi_prerelease
+ lib{odb-sqlite}: bin.lib.version = @-$version
+else
+ lib{odb-sqlite}: bin.lib.version = @-$abi_major.$abi_minor
+
+cxx.poptions =+ -DLIBODB_SQLITE_BUILD2
obja{*}: cxx.poptions += -DLIBODB_SQLITE_STATIC_BUILD
objs{*}: cxx.poptions += -DLIBODB_SQLITE_SHARED_BUILD
@@ -61,17 +69,6 @@ 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.
-#
-using? cli
-
-if! $cli.loaded
-{
- define cli: file
- cli{*}: extension = cli
-}
-
details/:
{
{hxx ixx cxx}{options}: cli{options}
diff --git a/odb/sqlite/details/.gitignore b/odb/sqlite/details/.gitignore
new file mode 100644
index 0000000..c6e608b
--- /dev/null
+++ b/odb/sqlite/details/.gitignore
@@ -0,0 +1 @@
+options.?xx