diff options
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 9 | ||||
| -rw-r--r-- | mesonbuild/modules/qt.py | 16 | ||||
| -rw-r--r-- | mesonbuild/modules/unstable_external_project.py | 2 |
3 files changed, 14 insertions, 13 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 7be4796..c9bec4a 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -381,7 +381,8 @@ class PkgConfigModule(ExtensionModule): if uninstalled: install_dir = os.path.dirname(state.backend.get_target_filename_abs(l)) else: - install_dir = l.get_custom_install_dir()[0] + _i = l.get_custom_install_dir() + install_dir = _i[0] if _i else None if install_dir is False: continue is_custom_target = isinstance(l, (build.CustomTarget, build.CustomTargetIndex)) @@ -471,9 +472,9 @@ class PkgConfigModule(ExtensionModule): raise mesonlib.MesonException('Pkgconfig_gen first positional argument must be a library object') default_name = mainlib.name default_description = state.project_name + ': ' + mainlib.name - install_dir = mainlib.get_custom_install_dir()[0] - if isinstance(install_dir, str): - default_install_dir = os.path.join(install_dir, 'pkgconfig') + install_dir = mainlib.get_custom_install_dir() + if install_dir and isinstance(install_dir[0], str): + default_install_dir = os.path.join(install_dir[0], 'pkgconfig') elif len(args) > 1: raise mesonlib.MesonException('Too many positional arguments passed to Pkgconfig_gen.') diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 7dafad7..874bcb1 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -556,14 +556,14 @@ class QtBaseModule(ExtensionModule): else: outdir = state.subdir cmd = [self.tools['lrelease'], '@INPUT@', '-qm', '@OUTPUT@'] - lrelease_kwargs = {'output': '@BASENAME@.qm', - 'input': ts, - 'install': kwargs['install'], - 'install_tag': 'i18n', - 'build_by_default': kwargs['build_by_default'], - 'command': cmd} - if install_dir is not None: - lrelease_kwargs['install_dir'] = install_dir + lrelease_kwargs: T.Dict[str, T.Any] = { + 'output': '@BASENAME@.qm', + 'input': ts, + 'install': kwargs['install'], + 'install_dir': install_dir or [], + 'install_tag': 'i18n', + 'build_by_default': kwargs['build_by_default'], + 'command': cmd} lrelease_target = build.CustomTarget(f'qt{self.qt_version}-compile-{ts}', outdir, state.subproject, lrelease_kwargs) translations.append(lrelease_target) if qresource: diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index b8e9850..80cf41b 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -71,7 +71,7 @@ class ExternalProject(NewExtensionModule): self.targets = self._create_targets() - def _configure(self, state: ModuleState): + def _configure(self, state: ModuleState) -> None: if self.configure_command == 'waf': FeatureNew('Waf external project', '0.60.0').use(self.subproject) waf = state.find_program('waf') |