Fixed the remaining modules.
This commit is contained in:
parent
80d665e8de
commit
4a37baf3c5
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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():
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue