aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-06-25 20:33:02 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-06-26 21:10:27 +0300
commit4a37baf3c500ff161b97dff50f6ad89e5542f362 (patch)
treee1386fe2a82a2b0f4490d1e6fa9f118c5065d6df
parent80d665e8decd644d737930d450f0bc66d6b5b02c (diff)
downloadmeson-4a37baf3c500ff161b97dff50f6ad89e5542f362.zip
meson-4a37baf3c500ff161b97dff50f6ad89e5542f362.tar.gz
meson-4a37baf3c500ff161b97dff50f6ad89e5542f362.tar.bz2
Fixed the remaining modules.
-rw-r--r--mesonbuild/modules/qt4.py2
-rw-r--r--mesonbuild/modules/qt5.py2
-rw-r--r--mesonbuild/modules/rpm.py2
-rw-r--r--mesonbuild/modules/windows.py2
4 files changed, 8 insertions, 0 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py
index 0386291..f5b1070 100644
--- a/mesonbuild/modules/qt4.py
+++ b/mesonbuild/modules/qt4.py
@@ -20,6 +20,7 @@ from ..dependencies import Qt4Dependency
from . import ExtensionModule
import xml.etree.ElementTree as ET
from . import ModuleReturnValue
+from . import permittedKwargs
class Qt4Module(ExtensionModule):
tools_detected = False
@@ -96,6 +97,7 @@ class Qt4Module(ExtensionModule):
except Exception:
return []
+ @permittedKwargs(set(['moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method']))
def preprocess(self, state, args, kwargs):
rcc_files = kwargs.pop('qresources', [])
if not isinstance(rcc_files, list):
diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py
index 6497694..4688ed0 100644
--- a/mesonbuild/modules/qt5.py
+++ b/mesonbuild/modules/qt5.py
@@ -20,6 +20,7 @@ from ..dependencies import Qt5Dependency
from . import ExtensionModule
import xml.etree.ElementTree as ET
from . import ModuleReturnValue
+from . import permittedKwargs
class Qt5Module(ExtensionModule):
tools_detected = False
@@ -102,6 +103,7 @@ class Qt5Module(ExtensionModule):
except Exception:
return []
+ @permittedKwargs(set(['moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method']))
def preprocess(self, state, args, kwargs):
rcc_files = kwargs.pop('qresources', [])
if not isinstance(rcc_files, list):
diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py
index 17396ae..b0a8db9 100644
--- a/mesonbuild/modules/rpm.py
+++ b/mesonbuild/modules/rpm.py
@@ -22,11 +22,13 @@ from .. import mlog
from . import GirTarget, TypelibTarget
from . import ModuleReturnValue
from . import ExtensionModule
+from . import noKwargs
import os
class RPMModule(ExtensionModule):
+ @noKwargs
def generate_spec_template(self, state, args, kwargs):
compiler_deps = set()
for compiler in state.compilers.values():
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index 3fb0107..af6f458 100644
--- a/mesonbuild/modules/windows.py
+++ b/mesonbuild/modules/windows.py
@@ -20,6 +20,7 @@ from ..mesonlib import MesonException
from . import get_include_args
from . import ModuleReturnValue
from . import ExtensionModule
+from . import permittedKwargs
class WindowsModule(ExtensionModule):
@@ -29,6 +30,7 @@ class WindowsModule(ExtensionModule):
return compilers[l]
raise MesonException('Resource compilation requires a C or C++ compiler.')
+ @permittedKwargs(set(['args', 'include_directories']))
def compile_resources(self, state, args, kwargs):
comp = self.detect_compiler(state.compilers)