meson: use one liner dependency on frigg

This commit is contained in:
Matt Taylor 2022-05-21 00:56:55 +01:00
parent 2ede4fb354
commit 0feb64990a

View file

@ -41,16 +41,12 @@ if not headers_only
libc_deps += cxxshim_dep libc_deps += cxxshim_dep
rtdl_deps += cxxshim_dep rtdl_deps += cxxshim_dep
# Ideally we'd use the same one-liner as above, but we can't pass default_options that way frigg_dep = dependency(
frigg_dep = dependency('frigg', method: 'pkg-config', required: false) 'frigg',
if not frigg_dep.found() default_options: ['frigg_no_install=true'],
message('frigg not found with pkg-config, falling back to subproject...') method: 'pkg-config',
frigg_dep = subproject( fallback: ['frigg', 'frigg_dep'],
'frigg', )
default_options: ['frigg_no_install=true']
).get_variable('frigg_dep')
endif
libc_deps += frigg_dep libc_deps += frigg_dep
rtdl_deps += frigg_dep rtdl_deps += frigg_dep