diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 00:22:39 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 00:24:17 +0300 |
| commit | 76d88259bde4e8d28d18c66c171fa6625d129a79 (patch) | |
| tree | 67e763cc3a4f619633d8c36bdaee640b12025139 /mesonbuild/modules/qt5.py | |
| parent | 0b81f5b0ade5876844c9059645ff031146b3b052 (diff) | |
| download | meson-76d88259bde4e8d28d18c66c171fa6625d129a79.zip meson-76d88259bde4e8d28d18c66c171fa6625d129a79.tar.gz meson-76d88259bde4e8d28d18c66c171fa6625d129a79.tar.bz2 | |
Make sure outputs do not contain stray path segments.
Diffstat (limited to 'mesonbuild/modules/qt5.py')
| -rw-r--r-- | mesonbuild/modules/qt5.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index e12d5ea..4f19b78 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -123,17 +123,16 @@ class Qt5Module(): srctmp = [srctmp] sources = args[1:] + srctmp if len(rcc_files) > 0: - rcc_kwargs = {'output' : '@BASENAME@.cpp', - 'arguments' : ['@INPUT@', '-o', '@OUTPUT@']} qrc_deps = [] for i in rcc_files: qrc_deps += self.parse_qrc(state, i) + basename = os.path.split(rcc_files[0])[1] rcc_kwargs = {'input' : rcc_files, - 'output' : rcc_files[0] + '.cpp', + 'output' : basename + '.cpp', 'command' : [self.rcc, '-o', '@OUTPUT@', '@INPUT@'], 'depend_files' : qrc_deps, } - res_target = build.CustomTarget(rcc_files[0].replace('.', '_'), + res_target = build.CustomTarget(basename.replace('.', '_'), state.subdir, rcc_kwargs) sources.append(res_target) |