diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-01-31 20:42:53 -0500 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-01 07:26:32 +0000 |
| commit | 8821c0aadcc901f1a624e082a59a385ed6725d98 (patch) | |
| tree | 3b7979fd7ef827b20d9c91b4f8faa1efc03919ec /mesonbuild/dependencies/misc.py | |
| parent | e1a83793ae986db44bc810c36a8ea8090d81fe3f (diff) | |
| download | meson-8821c0aadcc901f1a624e082a59a385ed6725d98.zip meson-8821c0aadcc901f1a624e082a59a385ed6725d98.tar.gz meson-8821c0aadcc901f1a624e082a59a385ed6725d98.tar.bz2 | |
better handle variable HDF5 setups, update Fortran compiler def
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index fb2b9db..208f063 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -52,23 +52,25 @@ class HDF5Dependency(ExternalDependency): if pkgdep.found(): self.compile_args = pkgdep.get_compile_args() # derive needed libraries by language - link_args = pkgdep.get_link_args() - lang_link_args = [] - for larg in link_args: + pd_link_args = pkgdep.get_link_args() + link_args = [] + for larg in pd_link_args: lpath = Path(larg) if lpath.is_file(): if language == 'cpp': - lang_link_args.append(str(lpath.parent / (lpath.stem + '_hl_cpp' + lpath.suffix))) - lang_link_args.append(str(lpath.parent / (lpath.stem + '_cpp' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + '_hl_cpp' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + '_cpp' + lpath.suffix))) elif language == 'fortran': - lang_link_args.append(str(lpath.parent / (lpath.stem + 'hl_fortran' + lpath.suffix))) - lang_link_args.append(str(lpath.parent / (lpath.stem + '_fortran' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + 'hl_fortran' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + '_fortran' + lpath.suffix))) - # C is used by other languages - lang_link_args.append(str(lpath.parent / (lpath.stem + '_hl' + lpath.suffix))) - lang_link_args.append(larg) + # HDF5 C libs are required by other HDF5 languages + link_args.append(str(lpath.parent / (lpath.stem + '_hl' + lpath.suffix))) + link_args.append(larg) + else: + link_args.append(larg) - self.link_args = lang_link_args + self.link_args = link_args self.version = pkgdep.get_version() self.is_found = True self.pcdep = pkgdep |