diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-18 14:26:18 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-18 14:26:18 +0530 |
| commit | eaafca6f4af11290331cbc4788688407c0fb654f (patch) | |
| tree | 632f88f4e883db31167cd67d9307dff6ecf501f2 | |
| parent | ade1f695a6105f2e39299e707b5f2e1120e37f0d (diff) | |
| download | meson-eaafca6f4af11290331cbc4788688407c0fb654f.zip meson-eaafca6f4af11290331cbc4788688407c0fb654f.tar.gz meson-eaafca6f4af11290331cbc4788688407c0fb654f.tar.bz2 | |
Qt: Allow passing a name arg to preprocess()
This sets a unique name for the CustomTarget and the output cpp file.
Closes #959
| -rw-r--r-- | mesonbuild/modules/qt4.py | 15 | ||||
| -rw-r--r-- | mesonbuild/modules/qt5.py | 17 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 3 |
3 files changed, 22 insertions, 13 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 63dfef8..2d89792 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -107,10 +107,10 @@ class Qt4Module(): moc_sources = kwargs.pop('moc_sources', []) if not isinstance(moc_sources, list): moc_sources = [moc_sources] - srctmp = kwargs.pop('sources', []) - if not isinstance(srctmp, list): - srctmp = [srctmp] - sources = args[1:] + srctmp + sources = kwargs.pop('sources', []) + if not isinstance(sources, list): + sources = [sources] + sources += args[1:] self._detect_tools(state.environment) err_msg = "{0} sources specified and couldn't find {1}, " \ "please check your qt4 installation" @@ -122,8 +122,11 @@ class Qt4Module(): qrc_deps = [] for i in rcc_files: qrc_deps += self.parse_qrc(state, i) - basename = os.path.split(rcc_files[0])[1] - name = 'qt4-' + basename.replace('.', '_') + if len(args) > 0: + name = args[0] + else: + basename = os.path.split(rcc_files[0])[1] + name = 'qt4-' + basename.replace('.', '_') rcc_kwargs = {'input' : rcc_files, 'output' : name + '.cpp', 'command' : [self.rcc, '-o', '@OUTPUT@', '@INPUT@'], diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 56c6269..da1ac83 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -113,10 +113,10 @@ class Qt5Module(): moc_sources = kwargs.pop('moc_sources', []) if not isinstance(moc_sources, list): moc_sources = [moc_sources] - srctmp = kwargs.pop('sources', []) - if not isinstance(srctmp, list): - srctmp = [srctmp] - sources = args[1:] + srctmp + sources = kwargs.pop('sources', []) + if not isinstance(sources, list): + sources = [sources] + sources += args[1:] self._detect_tools(state.environment) err_msg = "{0} sources specified and couldn't find {1}, " \ "please check your qt5 installation" @@ -128,13 +128,16 @@ class Qt5Module(): qrc_deps = [] for i in rcc_files: qrc_deps += self.parse_qrc(state, i) - basename = os.path.split(rcc_files[0])[1] + if len(args) > 0: + name = args[0] + else: + basename = os.path.split(rcc_files[0])[1] + name = 'qt5-' + basename.replace('.', '_') rcc_kwargs = {'input' : rcc_files, - 'output' : basename + '.cpp', + 'output' : name + '.cpp', 'command' : [self.rcc, '-o', '@OUTPUT@', '@INPUT@'], 'depend_files' : qrc_deps, } - name = 'qt5-' + basename.replace('.', '_') res_target = build.CustomTarget(name, state.subdir, rcc_kwargs) sources.append(res_target) if len(ui_files) > 0: diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index 013f14d..4523bab 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -30,6 +30,9 @@ foreach qt : ['qt4', 'qt5'] qresources : ['stuff.qrc', 'stuff2.qrc'], # Resource file for rcc compiler. ) + # Test that setting a unique name with a positional argument works + qtmodule.preprocess(qt + 'teststuff', qresources : ['stuff.qrc']) + qexe = executable(qt + 'app', sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. prep], |