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

Meson: improve dependency handling for nifticlib (#2882)

Browse Source 
This allows users to build against nifticlib 2.0.0 with e.g.:
`-Dnifti-prefix-dir=/usr`
This commit is contained in:
Kleis Auke Wolthuizen 2022-06-20 16:47:57 +02:00 committed by GitHub
parent d9f31be67d
commit 3bd0701604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
meson.build
View File

@ -487,32 +487,40 @@ elif libpoppler_dep.found() and cairo_dep.found()
cfg_var.set('HAVE_POPPLER', '1') cfg_var.set('HAVE_POPPLER', '1')
endif endif
# niftiio.pc is not always present, so fall back to CMake's find_package() # niftiio.pc is not present, and only provides the CMake package definition
# functionality # files since v3.0.0, so, as a last resort, fall back on heuristic grabbing the
# libs when -Dnifti-prefix-dir=<PREFIX> is specified
# #
# cmake find fails on ubuntu due to /usr/lib/x86_64-linux-gnu madness, so it's # cmake find fails on ubuntu due to /usr/lib/x86_64-linux-gnu madness, so it's
# simplest to create a libniftiio.pc in this case # simplest to create a niftiio.pc in this case
# #
# create /usr/lib/x86_64-linux-gnu/pkgconfig/libniftiio.pc: # create /usr/lib/x86_64-linux-gnu/pkgconfig/niftiio.pc:
# #
# prefix=/usr # prefix=/usr
# exec_prefix=${prefix}
# libdir=${prefix}/lib/x86_64-linux-gnu # libdir=${prefix}/lib/x86_64-linux-gnu
# includedir=${prefix}/include/nifti # includedir=${prefix}/include/nifti
# Name: libniftiio # Name: niftiio
# Description: nifti library # Description: Core i/o routines for reading and writing nifti-1 format files
# Version: 3.0.1 # Version: 3.0.1
# Requires: xproto # Requires: xproto
# Cflags: -I${includedir}
# Libs: -L${libdir} -lniftiio -lznz # Libs: -L${libdir} -lniftiio -lznz
# Cflags: -I${includedir}
# #
# TODO: simplify this when requiring meson>=0.60.0 # TODO: simplify this when requiring meson>=0.60.0
libnifti_dep = dependency('niftiio', required: get_option('nifti')) nifti_prefix_dir = get_option('nifti-prefix-dir')
libnifti_dep = dependency('niftiio', method: 'pkg-config', required: false)
if not libnifti_dep.found() if not libnifti_dep.found()
libnifti_dep = dependency('NIFTI', libnifti_dep = dependency('NIFTI',
version: '>=3.0.0',
method: 'cmake', method: 'cmake',
modules: ['NIFTI::niftiio'], modules: ['NIFTI::niftiio'],
required: get_option('nifti')) required: get_option('nifti').enabled() and nifti_prefix_dir == '')
endif
if nifti_prefix_dir != '' and not libnifti_dep.found()
nifti_inc = include_directories(nifti_prefix_dir / 'include' / 'nifti')
nifti_lib = cc.find_library('niftiio', has_headers: ['nifti1_io.h'], header_include_directories: nifti_inc, required: get_option('nifti'))
znz_lib = cc.find_library('znz', has_headers: ['znzlib.h'], header_include_directories: nifti_inc, required: get_option('nifti'))
libnifti_dep = declare_dependency(dependencies: [nifti_lib, znz_lib], include_directories: nifti_inc)
endif endif
if not get_option('nifti').disabled() and libnifti_dep.found() if not get_option('nifti').disabled() and libnifti_dep.found()
libvips_deps += libnifti_dep libvips_deps += libnifti_dep

1
meson_options.txt
View File

@ -24,6 +24,7 @@ option('magick-features', type: 'array', choices: ['load', 'save'], value: ['loa
option('magick-module', type: 'feature', value: 'auto', description: 'Build libMagic as module') option('magick-module', type: 'feature', value: 'auto', description: 'Build libMagic as module')
option('matio', type: 'feature', value: 'auto', description: 'Build with matio') option('matio', type: 'feature', value: 'auto', description: 'Build with matio')
option('nifti', type: 'feature', value: 'auto', description: 'Build with nifti') option('nifti', type: 'feature', value: 'auto', description: 'Build with nifti')
option('nifti-prefix-dir', type: 'string', value: '', description: 'Prefix where nifticlib is installed (optional)')
option('openexr', type: 'feature', value: 'auto', description: 'Build with OpenEXR') option('openexr', type: 'feature', value: 'auto', description: 'Build with OpenEXR')
option('openjpeg', type: 'feature', value: 'auto', description: 'Build with libopenjp2') option('openjpeg', type: 'feature', value: 'auto', description: 'Build with libopenjp2')
option('openslide', type: 'feature', value: 'auto', description: 'Build with OpenSlide') option('openslide', type: 'feature', value: 'auto', description: 'Build with OpenSlide')