From 1b7f989c2678b2271c84fd60a492a73b50fe4734 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 5 Mar 2019 18:08:01 +0300 Subject: Align with latest bdep-new --- cutl/buildfile | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/cutl/buildfile b/cutl/buildfile index 5a47769..5fc6bcd 100644 --- a/cutl/buildfile +++ b/cutl/buildfile @@ -11,32 +11,45 @@ details/build2/{h}{*} # clean results in a state identical to distributed). # hxx{version}: in{version} $src_root/manifest -hxx{version}: dist = true -hxx{version}: clean = ($src_root != $out_root) +hxx{version}: +{ + 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{cutl}: bin.lib.version = @"-$version.project_id" -else - lib{cutl}: bin.lib.version = @"-$version.major.$version.minor" - cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBCUTL_BUILD2 + obja{*}: cxx.poptions += -DLIBCUTL_STATIC_BUILD objs{*}: cxx.poptions += -DLIBCUTL_SHARED_BUILD +# Export options. +# lib{cutl}: cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBCUTL_BUILD2 + liba{cutl}: cxx.export.poptions += -DLIBCUTL_STATIC libs{cutl}: cxx.export.poptions += -DLIBCUTL_SHARED -# Install into the cutl/ subdirectory of, say, /usr/include/ recreating -# subdirectories. +# 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{cutl}: bin.lib.version = @"-$version.project_id" +else + lib{cutl}: bin.lib.version = @"-$version.major.$version.minor" + +# Install into the cutl/ subdirectory of, say, /usr/include/ +# recreating subdirectories. # install_include = [dir_path] include/cutl/ -{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 even when LIBCUTL_BUILD2 is not defined. # -- cgit v1.1