aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-03-05 15:06:58 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-03-05 15:06:58 +0300
commitc79ba5c1b93aaad4c4bcaff1cb147eba24f2d4c4 (patch)
tree08448fbcf18d19051de7ee7bec4d43d2c8287bf4
parentba661f79fc6ebf5af0ffa80701f18e99ac2a77ac (diff)
Align with latest bdep-new
-rw-r--r--odb/buildfile35
1 files changed, 24 insertions, 11 deletions
diff --git a/odb/buildfile b/odb/buildfile
index 3b8f0aa..4a9a7cc 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -16,32 +16,45 @@ details/shared-ptr/{hxx ixx txx cxx}{*} \
# 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}: bin.lib.version = @"-$version.project_id"
-else
- lib{odb}: bin.lib.version = @"-$version.major.$version.minor"
-
cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_BUILD2
+
obja{*}: cxx.poptions += -DLIBODB_STATIC_BUILD
objs{*}: cxx.poptions += -DLIBODB_SHARED_BUILD
+# Export options.
+#
lib{odb}: cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_BUILD2
+
liba{odb}: cxx.export.poptions += -DLIBODB_STATIC
libs{odb}: cxx.export.poptions += -DLIBODB_SHARED
+# 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}: bin.lib.version = @"-$version.project_id"
+else
+ lib{odb}: bin.lib.version = @"-$version.major.$version.minor"
+
# Install into the odb/ subdirectory of, say, /usr/include/ recreating
# subdirectories.
#
install_include = [dir_path] include/odb/
-{hxx ixx txx}{*}: install = $install_include
-{hxx ixx txx}{*}: install.subdirs = true
+{hxx ixx txx}{*}:
+{
+ install = $install_include
+ install.subdirs = true
+}
if ($cxx.target.class != "windows")
details/win32/*: install = false