sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Meson: ensure NIfTI can be found (#2689) 

* Meson: ensure NIfTI can be found

* Incorporate review comment
This commit is contained in:
Kleis Auke Wolthuizen 2022-02-27 14:40:11 +01:00 committed by GitHub
parent 6639b90f22
commit dcfac75f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -152,7 +152,7 @@ if fftw_dep.found()
cfg_var.set('HAVE_FFTW', '1')
endif
# We can simplify this when requiring meson>=0.60.0
# TODO: simplify this when requiring meson>=0.60.0
magick_dep = dependency(get_option('magick-package'), required: false)
if not magick_dep.found()
# very old versions called it "ImageMagick"
@ -270,7 +270,7 @@ endif
# - it's sometimes called "spng.pc", sometimes "libspng.pc", we must search for
# both
# - we need 0.7+ for PNG write support
# - simplify this when requiring meson>=0.60.0
# TODO: simplify this when requiring meson>=0.60.0
spng_dep = dependency('spng', version: '>=0.7', required: false)
if not spng_dep.found()
spng_dep = dependency('libspng', version: '>=0.7', required: get_option('spng'))
@ -465,11 +465,13 @@ elif libpoppler_dep.found() and cairo_dep.found()
cfg_var.set('HAVE_POPPLER', '1')
endif
libnifti_dep = cc.find_library('niftiio', has_headers: 'nifti1_io.h', required: false)
# niftiio.pc is not always present, so fallback to CMake's find_package() functionally
# TODO: simplify this when requiring meson>=0.60.0
libnifti_dep = dependency('niftiio', required: false)
if not libnifti_dep.found()
libnifti_dep = dependency('NIFTI', method: 'cmake', modules: ['NIFTI'], required: get_option('nifti'))
libnifti_dep = dependency('NIFTI', method: 'cmake', modules: ['NIFTI::niftiio'], required: get_option('nifti'))
endif
if libnifti_dep.found()
if not get_option('nifti').disabled() and libnifti_dep.found()
libvips_deps += libnifti_dep
cfg_var.set('HAVE_NIFTI', '1')
endif