Skip to content

Commit

Permalink
dependencies: reject Qt6 pkg-config dependency if libexecdir is not k…
Browse files Browse the repository at this point in the history
…nown

This is needed for 6.1 support as noted in commit
a606ce2 but at the time there was no
pkg-config detection method at all. The stub code for Qt6 didn't support
libexecdir at all, and the pkg-config files added to newer versions of
Qt6 didn't export that information either until a further bugfix release.

Enforce that this information is required.
  • Loading branch information
eli-schwartz authored and nirbheek committed Aug 12, 2022
1 parent 2a97817 commit bc2305e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions mesonbuild/dependencies/qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,13 @@ def get_private_includes(self, mod_inc_dir: str, module: str) -> T.List[str]:

class Qt6PkgConfigDependency(QtPkgConfigDependency):

def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
super().__init__(name, env, kwargs)
if not self.libexecdir:
mlog.debug(f'detected Qt6 {self.version} pkg-config dependency does not '
'have proper tools support, ignoring')
self.is_found = False

@staticmethod
def get_pkgconfig_host_bins(core: PkgConfigDependency) -> str:
return core.get_pkgconfig_variable('bindir', [], None)
Expand Down

0 comments on commit bc2305e

Please sign in to comment.