diff options
| author | David Robillard <d@drobilla.net> | 2022-08-09 09:37:15 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-08-09 09:37:15 -0400 |
| commit | 9960380c5581b02e927e39c51cb1c38d020a30b6 (patch) | |
| tree | 809a44ecd58cada7c4f19d14db77839624524cd8 | |
| parent | c1cda16cede3998f0f590db932944bce39550820 (diff) | |
| download | sord-9960380c5581b02e927e39c51cb1c38d020a30b6.tar.gz sord-9960380c5581b02e927e39c51cb1c38d020a30b6.tar.bz2 sord-9960380c5581b02e927e39c51cb1c38d020a30b6.zip | |
Allow programs to be used from subproject
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | meson.build | 16 | ||||
| -rw-r--r-- | src/sord_config.h | 2 |
3 files changed, 17 insertions, 7 deletions
@@ -1,3 +1,9 @@ +sord (0.16.13) unstable; urgency=medium + + * Allow programs to be used from subproject + + -- David Robillard <d@drobilla.net> Tue, 09 Aug 2022 13:35:21 +0000 + sord (0.16.12) stable; urgency=medium * Fix various warnings diff --git a/meson.build b/meson.build index 1a991bc..bf7d2dc 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 OR ISC project('sord', ['c'], - version: '0.16.12', + version: '0.16.13', license: 'ISC', meson_version: '>= 0.56.0', default_options: [ @@ -114,14 +114,18 @@ if not get_option('tools').disabled() install: true, dependencies: sord_dep) + meson.override_find_program('sordi', sordi) + pcre_dep = dependency('libpcre', required: false) if pcre_dep.found() - sordi = executable('sord_validate', - files('src/sord_validate.c'), - c_args: c_suppressions, - install: true, - dependencies: [sord_dep, pcre_dep]) + sord_validate = executable('sord_validate', + files('src/sord_validate.c'), + c_args: c_suppressions, + install: true, + dependencies: [sord_dep, pcre_dep]) + + meson.override_find_program('sord_validate', sord_validate) endif if not get_option('docs').disabled() diff --git a/src/sord_config.h b/src/sord_config.h index e349bf9..14b6d64 100644 --- a/src/sord_config.h +++ b/src/sord_config.h @@ -29,7 +29,7 @@ #define SORD_CONFIG_H // Define version unconditionally so a warning will catch a mismatch -#define SORD_VERSION "0.16.12" +#define SORD_VERSION "0.16.13" #if !defined(SORD_NO_DEFAULT_CONFIG) |