david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer jni as a dependency rather than manually seeking it. This is unlikely to work in Meson < 0.62, and Meson >= 0.62 gives a warning that the feature is new - but it seems to me that older versions should just do a standard dep lookup and fail, so we can fall back on the same logic we were using anyway (i.e. manually supplied include path)

Browse Source
This commit is contained in:
Chris Cannam
2022-09-26 09:39:10 +01:00
parent 020702e7ea
commit 0eaca1711c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@@ -119,6 +119,7 @@ samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
speexdsp_dep = dependency('speexdsp', version: '>= 1.0.0', required: false) speexdsp_dep = dependency('speexdsp', version: '>= 1.0.0', required: false)
sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false) sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false) vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false) boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false)
thread_dep = dependency('threads') thread_dep = dependency('threads')
have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args) have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
@@ -126,7 +127,13 @@ have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
have_sincos = cpp.has_function('sincos', have_sincos = cpp.has_function('sincos',
prefix: '#define _GNU_SOURCE\n#include <math.h>', prefix: '#define _GNU_SOURCE\n#include <math.h>',
args: '-lm') args: '-lm')
have_jni = cpp.has_header('jni.h', args: extra_include_args)
jni_dep = dependency('jni', version: '>= 7.0.0', required: false)
if not jni_dep.found()
if cpp.has_header('jni.h', args: extra_include_args)
jni_dep = declare_dependency()
endif
endif
javac = find_program('javac', required: false) javac = find_program('javac', required: false)
jar = find_program('jar', required: false) jar = find_program('jar', required: false)
@@ -584,7 +591,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li
) )
endif endif
if have_jni and javac.found() and jar.found() if jni_dep.found() and javac.found() and jar.found()
target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] } target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
message('Will build Java Native Interface') message('Will build Java Native Interface')
rubberband_jni = shared_library( rubberband_jni = shared_library(
@@ -599,6 +606,7 @@ if have_jni and javac.found() and jar.found()
], ],
dependencies: [ dependencies: [
rubberband_objlib_dep, rubberband_objlib_dep,
jni_dep,
general_dependencies, general_dependencies,
], ],
# NB the JNI library is not versioned # NB the JNI library is not versioned