Allow programs to be used from subproject

6 files changed, 20 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 896528d..ef6ca2f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+lilv (0.24.17) unstable; urgency=medium
+
+  * Allow programs to be used from subproject
+
+ -- David Robillard <d@drobilla.net>  Tue, 09 Aug 2022 13:44:56 +0000
+
 lilv (0.24.16) stable; urgency=medium
 
   * Fix fallback flock() detection on MacOS
diff --git a/bindings/python/conf.py b/bindings/python/conf.py
index 2390d65..ef72ba1 100644
--- a/bindings/python/conf.py
+++ b/bindings/python/conf.py
@@ -56,9 +56,9 @@ copyright = u'2016, David Robillard'
 # built documents.
 #
 # The short X.Y version.
-version = '0.24.16'
+version = '0.24.17'
 # The full version, including alpha/beta/rc tags.
-release = '0.24.16'
+release = '0.24.17'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/bindings/python/lilv.py b/bindings/python/lilv.py
index fbd581c..a0ca308 100644
--- a/bindings/python/lilv.py
+++ b/bindings/python/lilv.py
@@ -3,7 +3,7 @@
 __author__ = "David Robillard"
 __copyright__ = "Copyright 2016-2020 David Robillard"
 __license__ = "ISC"
-__version__ = "0.24.16"
+__version__ = "0.24.17"
 __maintainer__ = "David Robillard"
 __email__ = "d@drobilla.net"
 __status__ = "Production"
diff --git a/meson.build b/meson.build
index ea0012e..b4ee8fa 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: CC0-1.0 OR ISC
 
 project('lilv', ['c'],
-        version: '0.24.16',
+        version: '0.24.17',
         license: 'ISC',
         meson_version: '>= 0.56.0',
         default_options: [
diff --git a/src/lilv_config.h b/src/lilv_config.h
index 41d5706..08a2080 100644
--- a/src/lilv_config.h
+++ b/src/lilv_config.h
@@ -29,7 +29,7 @@
 #define LILV_CONFIG_H
 
 // Define version unconditionally so a warning will catch a mismatch
-#define LILV_VERSION "0.24.16"
+#define LILV_VERSION "0.24.17"
 
 #if !defined(LILV_NO_DEFAULT_CONFIG)
 
diff --git a/tools/meson.build b/tools/meson.build
index 59249f2..5e4333d 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -13,7 +13,7 @@ basic_tools = [
 ]
 
 foreach tool : basic_tools
-  executable(
+  exe = executable(
     tool,
     files(tool + '.c'),
     c_args: c_suppressions,
@@ -22,6 +22,8 @@ foreach tool : basic_tools
     install: true,
   )
 
+  meson.override_find_program(tool, exe)
+
   install_man(files('..' / 'doc' / tool + '.1'))
 endforeach
 
@@ -42,7 +44,7 @@ sndfile_dep = dependency(
 )
 
 if sndfile_dep.found()
-  executable(
+  lv2apply = executable(
     'lv2apply',
     files('lv2apply.c'),
     c_args: c_suppressions,
@@ -51,6 +53,8 @@ if sndfile_dep.found()
     install: true,
   )
 
+  meson.override_find_program('lv2apply', lv2apply)
+
   install_man(files('..' / 'doc' / 'lv2apply.1'))
 endif
 
@@ -69,7 +73,7 @@ int main(void) { struct timespec t; return clock_gettime(CLOCK_MONOTONIC, &t); }
                  args: platform_defines,
                  dependencies: [rt_dep],
                  name: 'clock_gettime')
-    executable(
+    lv2bench = executable(
       'lv2bench',
       files('lv2bench.c'),
       c_args: c_suppressions,
@@ -78,6 +82,8 @@ int main(void) { struct timespec t; return clock_gettime(CLOCK_MONOTONIC, &t); }
       install: true,
     )
 
+    meson.override_find_program('lv2bench', lv2bench)
+
     install_man(files('..' / 'doc' / 'lv2bench.1'))
   endif
 endif