diff options
| -rw-r--r-- | mesonbuild/dependencies/qt.py | 9 | ||||
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index f645f0e..d2be1a4 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -69,6 +69,12 @@ def get_qmake_host_bins(qvars: T.Dict[str, str]) -> str: return qvars['QT_INSTALL_BINS'] +def get_qmake_host_libexecs(qvars: T.Dict[str, str]) -> T.Optional[str]: + if 'QT_HOST_LIBEXECS' in qvars: + return qvars['QT_HOST_LIBEXECS'] + return qvars.get('QT_INSTALL_LIBEXECS') + + def _get_modules_lib_suffix(version: str, info: 'MachineInfo', is_debug: bool) -> str: """Get the module suffix based on platform and debug type.""" suffix = '' @@ -118,6 +124,7 @@ class _QtBase: link_args: T.List[str] clib_compiler: 'Compiler' env: 'Environment' + libexecdir: T.Optional[str] = None def __init__(self, name: str, kwargs: T.Dict[str, T.Any]): self.qtname = name.capitalize() @@ -277,6 +284,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta): libdir = qvars['QT_INSTALL_LIBS'] # Used by qt.compilers_detect() self.bindir = get_qmake_host_bins(qvars) + self.libexecdir = get_qmake_host_libexecs(qvars) # Use the buildtype by default, but look at the b_vscrt option if the # compiler supports it. @@ -353,6 +361,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta): self.is_found = True # Used by self.compilers_detect() self.bindir = get_qmake_host_bins(qvars) + self.libexecdir = get_qmake_host_libexecs(qvars) def log_info(self) -> str: return 'qmake' diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 99581a4..cb8a202 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -131,6 +131,8 @@ class QtBaseModule(ExtensionModule): for b in self.tools: if qt_dep.bindir: yield os.path.join(qt_dep.bindir, b), b + if qt_dep.libexecdir: + yield os.path.join(qt_dep.libexecdir, b), b # prefer the <tool>-qt<version> of the tool to the plain one, as we # don't know what the unsuffixed one points to without calling it. yield f'{b}-qt{qt_dep.qtver}', b |