From 7b67bd437e296e917c0c26d8bff96c80b102b8cd Mon Sep 17 00:00:00 2001 From: Russel Winder Date: Thu, 20 Dec 2018 12:05:28 +0000 Subject: [PATCH] =?UTF-8?q?Switch=20to=20library=20from=20static=20library?= =?UTF-8?q?=E2=80=A6=20(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Switch to library from static library and add back the version and soversion attributes. * Minor rearrangement to avoid duplication of literals. * Let the soname be determined from the version number. --- meson.build | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index d555030..f666958 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,12 @@ -project('tinyendian', 'd', - meson_version: '>=0.40', - version: '0.2.0' -) +# -*- mode: python; -*- -project_soversion = '0' +project( + 'tinyendian', + 'd', + meson_version: '>=0.41', + version: '0.2.0', + default_options: ['buildtype=release'], +) src_dir = include_directories('source/') pkgc = import('pkgconfig') @@ -11,19 +14,24 @@ pkgc = import('pkgconfig') tinyendian_src = [ 'source/tinyendian.d' ] + install_headers(tinyendian_src, subdir: 'd/') -tinyendian_lib = static_library('tinyendian', - [tinyendian_src], - include_directories: [src_dir], - install: true, - pic: true +tinyendian_lib = library( + meson.project_name(), + [tinyendian_src], + include_directories: [src_dir], + version: meson.project_version(), + pic: true, + install: true, ) -pkgc.generate(name: 'tinyendian', - libraries: tinyendian_lib, - subdirs: 'd/', - version: meson.project_version(), - description: 'Lightweight endianness library for D.' + +pkgc.generate( + name: meson.project_name(), + libraries: tinyendian_lib, + subdirs: 'd/', + version: meson.project_version(), + description: 'Lightweight endianness library for D.' ) # Make Tinyendian easy to use as subproject