meson: Build nbis separately to allow changing flags
As nbis is an external source bundle, it does not necessarily make sense to enable/fix all warnings to the extend we do for our own library code. As such, separate the build process into multiple stages.
This commit is contained in:
parent
e64c18f8de
commit
e143f12e57
1 changed files with 12 additions and 1 deletions
|
@ -183,9 +183,19 @@ mapfile = 'libfprint.ver'
|
||||||
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
|
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
|
||||||
|
|
||||||
deps = [ mathlib_dep, glib_dep, gusb_dep, nss_dep, imaging_dep, gio_dep ]
|
deps = [ mathlib_dep, glib_dep, gusb_dep, nss_dep, imaging_dep, gio_dep ]
|
||||||
|
|
||||||
|
nbis_lib = static_library('nbis',
|
||||||
|
nbis_sources,
|
||||||
|
include_directories: [
|
||||||
|
root_inc,
|
||||||
|
include_directories('nbis/include'),
|
||||||
|
],
|
||||||
|
dependencies: deps,
|
||||||
|
install: false)
|
||||||
|
|
||||||
libfprint = library('fprint',
|
libfprint = library('fprint',
|
||||||
libfprint_sources + fp_enums + fpi_enums +
|
libfprint_sources + fp_enums + fpi_enums +
|
||||||
drivers_sources + nbis_sources + other_sources,
|
drivers_sources + other_sources,
|
||||||
soversion: soversion,
|
soversion: soversion,
|
||||||
version: libversion,
|
version: libversion,
|
||||||
c_args: drivers_cflags,
|
c_args: drivers_cflags,
|
||||||
|
@ -195,6 +205,7 @@ libfprint = library('fprint',
|
||||||
],
|
],
|
||||||
link_args : vflag,
|
link_args : vflag,
|
||||||
link_depends : mapfile,
|
link_depends : mapfile,
|
||||||
|
link_with: nbis_lib,
|
||||||
dependencies: deps,
|
dependencies: deps,
|
||||||
install: true)
|
install: true)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue