aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-03-05 15:14:02 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-03-05 17:47:51 +0300
commit4bcf4e57d25252c4de8aa7f1551d61eafebe19d5 (patch)
tree13761531272e2094ee6d2a8d8591048775f4b15f
parentc869d577f664881358f1ccd81fb5fce3d477efb7 (diff)
Align with latest bdep-new
-rw-r--r--odb/sqlite/buildfile56
1 files changed, 38 insertions, 18 deletions
diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile
index 09f05fc..26ea2b8 100644
--- a/odb/sqlite/buildfile
+++ b/odb/sqlite/buildfile
@@ -15,27 +15,41 @@ lib{odb-sqlite}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \
# clean results in a state identical to distributed).
#
hxx{version-build2}: in{version-build2} $src_root/manifest
-hxx{version-build2}: dist = true
-hxx{version-build2}: clean = ($src_root != $out_root)
+hxx{version-build2}:
+{
+ dist = true
+ clean = ($src_root != $out_root)
+}
-# For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version.
+# Build options.
#
-if $version.pre_release
- lib{odb-sqlite}: bin.lib.version = @"-$version.project_id"
-else
- lib{odb-sqlite}: bin.lib.version = @"-$version.major.$version.minor"
-
cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_SQLITE_BUILD2
+
obja{*}: cxx.poptions += -DLIBODB_SQLITE_STATIC_BUILD
objs{*}: cxx.poptions += -DLIBODB_SQLITE_SHARED_BUILD
-lib{odb-sqlite}: cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_SQLITE_BUILD2
+# Export options.
+#
+lib{odb-sqlite}:
+{
+ cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_SQLITE_BUILD2
+ cxx.export.libs = $int_libs
+}
+
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
+# For pre-releases use the complete version to make sure they cannot be used
+# in place of another pre-release or the final version. See the version module
+# for details on the version.* variable values.
+#
+if $version.pre_release
+ lib{odb-sqlite}: bin.lib.version = @"-$version.project_id"
+else
+ lib{odb-sqlite}: bin.lib.version = @"-$version.major.$version.minor"
+# Generated options parser.
+#
details/
{
if $cli.configured
@@ -51,9 +65,12 @@ details/
# distributed). But don't install their headers since they are only used
# internally in the database implementation.
#
- cli.cxx{*}: dist = true
- cli.cxx{*}: clean = ($src_root != $out_root)
- cli.cxx{*}: install = false
+ cli.cxx{*}:
+ {
+ dist = true
+ clean = ($src_root != $out_root)
+ install = false
+ }
}
else
# No install for the pre-generated case.
@@ -61,13 +78,16 @@ details/
hxx{options}@./ ixx{options}@./: install = false
}
-# Install into the odb/sqlite/ subdirectory of, say, /usr/include/ recreating
-# subdirectories.
+# Install into the odb/sqlite/ subdirectory of, say, /usr/include/
+# recreating subdirectories.
#
install_include = [dir_path] include/odb/sqlite/
-{hxx ixx txx}{*}: install = $install_include
-{hxx ixx txx}{*}: install.subdirs = true
+{hxx ixx txx}{*}:
+{
+ install = $install_include
+ install.subdirs = true
+}
# We want these to be picked up whether LIBODB_SQLITE_BUILD2 is defined or not.
#