diff options
| -rw-r--r-- | odb/qt/buildfile | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/odb/qt/buildfile b/odb/qt/buildfile index 4092c51..e8c8d55 100644 --- a/odb/qt/buildfile +++ b/odb/qt/buildfile @@ -7,11 +7,14 @@ define options: file options{*}: extension = options - # Install into the odb/qt/ subdirectory of, say, /usr/include/ recreating - # subdirectories. + # Install into the odb/qt/ subdirectory of, say, /usr/include/ + # recreating subdirectories. # - {hxx ixx txx options}{*}: install = include/odb/ - {hxx ixx txx options}{*}: install.subdirs = true + {hxx ixx txx options}{*}: + { + install = include/odb/ + install.subdirs = true + } qt/ { @@ -28,29 +31,38 @@ # (so that 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-qt}: bin.lib.version = @"-$version.project_id" - else - lib{odb-qt}: bin.lib.version = @"-$version.major.$version.minor" - cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_QT_BUILD2 + obja{*}: cxx.poptions += -DLIBODB_QT_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_QT_SHARED_BUILD - lib{odb-qt}: cxx.export.poptions = "-I$out_root" "-I$src_root" \ - -DLIBODB_QT_BUILD2 + # Export options. + # + lib{odb-qt}: + { + cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_QT_BUILD2 + cxx.export.libs = $int_libs + } liba{odb-qt}: cxx.export.poptions += -DLIBODB_QT_STATIC libs{odb-qt}: cxx.export.poptions += -DLIBODB_QT_SHARED - lib{odb-qt}: 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-qt}: bin.lib.version = @"-$version.project_id" + else + lib{odb-qt}: bin.lib.version = @"-$version.major.$version.minor" # Installation tweaks. # |