aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-04-23 23:39:05 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2022-04-30 11:49:12 +0300
commit93ed7531c4a1e08defc5ea3b37427e59f67582db (patch)
treee46a98dca5c3418f47180d3344971185ea810222 /mesonbuild/modules
parent945252a3bb43300e0486ab9fff62bc6e00fac8a8 (diff)
downloadmeson-93ed7531c4a1e08defc5ea3b37427e59f67582db.zip
meson-93ed7531c4a1e08defc5ea3b37427e59f67582db.tar.gz
meson-93ed7531c4a1e08defc5ea3b37427e59f67582db.tar.bz2
qt module: fix missing sanity check for install_dir + install
Regression in commit 11f96380351a88059ec55f1070fdebc1b1033117. When `install: true` the install_dir must be set. The CustomTarget initializer no longer checks this for us, so we must include the check ourselves.
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/qt.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index 6fbe0a2..55faa91 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -546,6 +546,8 @@ class QtBaseModule(ExtensionModule):
if any(isinstance(s, (build.CustomTarget, build.CustomTargetIndex, build.GeneratedList)) for s in ts_files):
FeatureNew.single_use('qt.compile_translations: custom_target or generator for "ts_files" keyword argument',
'0.60.0', state.subproject, location=state.current_node)
+ if kwargs['install'] and not kwargs['install_dir']:
+ raise MesonException('qt.compile_translations: "install_dir" keyword argument must be set when "install" is true.')
qresource = kwargs['qresource']
if qresource:
if ts_files: