Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependencies: netcdf always look for netcdf-fortran for fortran 

Otherwise it tries to link with the C bindings and fails. This is why
the test is broken on archlinux
This commit is contained in:
Dylan Baker 2020-01-30 10:06:35 -08:00 committed by Xavier Claessens
parent 4104cbdaf9
commit 402f7afdb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/dependencies/misc.py
View File

@ -45,12 +45,12 @@ def netcdf_factory(env: 'Environment', for_machine: 'MachineChoice',
candidates = [] # type: T.List['DependencyType']
if DependencyMethods.PKGCONFIG in methods:
pkgconfig_files = ['netcdf']
if language == 'fortran':
pkgconfig_files.append('netcdf-fortran')
pkg = 'netcdf-fortran'
else:
pkg = 'netcdf'
for pkg in pkgconfig_files:
candidates.append(functools.partial(PkgConfigDependency, pkg, env, kwargs, language=language))
candidates.append(functools.partial(PkgConfigDependency, pkg, env, kwargs, language=language))
if DependencyMethods.CMAKE in methods:
candidates.append(functools.partial(CMakeDependency, 'NetCDF', env, kwargs, language=language))