aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-03-05 14:59:39 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-03-06 01:24:55 +0300
commitf1f3c4fd33dcf4edfeea7e7afe8a72165c65808e (patch)
treef1274db1a8a7a8df2afddb7747c058ab9388035e
parent85b0ac2c2e2aadf07cfe42301bb380321bb2422a (diff)
Align with latest bdep-new
-rw-r--r--odb/buildfile35
1 files changed, 20 insertions, 15 deletions
diff --git a/odb/buildfile b/odb/buildfile
index d83aa6f..35d866e 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -66,13 +66,11 @@ elif ($cxx.target.system == 'darwin')
libus{odb}: {hxx ixx txx cxx}{** -odb -options} {hxx ixx cxx}{options} $libs
+# Build options.
+#
cxx.poptions += "-I$plugin_dir/include" "-DODB_GXX_NAME=\"$gxx_name\""
cxx.poptions += -DODB_BUILD2 # @@ TMP while supporting other build systems.
-# Don't install any of the plugin's headers.
-#
-{hxx ixx txx}{*}: install = false
-
# Generated options parser.
#
# @@ TMP: currently generated code is committed to allow building from git.
@@ -86,15 +84,22 @@ if $cli.configured
--generate-modifier --generate-description --suppress-undocumented \
--cxx-prologue '#include <odb/option-parsers.hxx>'
- # Include the generated cli files into the distribution and don't remove
- # them when cleaning in src (so that clean results in a state identical to
- # distributed).
- #
- cli.cxx{*}: dist = true
- cli.cxx{*}: clean = ($src_root != $out_root)
-
- # We keep the generated code in the repository so copy it back to src in
- # case of a forwarded configuration.
- #
- cli.cxx{*}: backlink = overwrite
+ cli.cxx{*}:
+ {
+ # Include the generated cli files into the distribution and don't remove
+ # them when cleaning in src (so that clean results in a state identical to
+ # distributed).
+ #
+ dist = true
+ clean = ($src_root != $out_root)
+
+ # We keep the generated code in the repository so copy it back to src in
+ # case of a forwarded configuration.
+ #
+ backlink = overwrite
+ }
}
+
+# Don't install any of the plugin's headers.
+#
+{hxx ixx txx}{*}: install = false