diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-17 17:28:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-17 17:28:09 +0300 |
| commit | 8014a42f57af04620ff0625aa727864779479f1a (patch) | |
| tree | 1fc5bba59443c99da9662ed2672d263a984f2bf4 /mesonbuild | |
| parent | cd63ca9c194c328e9a05b1c81898657c3acfe498 (diff) | |
| parent | 4bc6b68bae3a11d9a77ac5511d3dd54aa2d9ff3b (diff) | |
| download | meson-8014a42f57af04620ff0625aa727864779479f1a.zip meson-8014a42f57af04620ff0625aa727864779479f1a.tar.gz meson-8014a42f57af04620ff0625aa727864779479f1a.tar.bz2 | |
Merge pull request #3715 from jon-turney/duplicate-rsrc-script-name
Use a unique name for windows resource compilation custom target
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/windows.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index fb5bacf..7dd87f2 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -88,8 +88,10 @@ class WindowsModule(ExtensionModule): 'depend_files': wrc_deps, } - if isinstance(src, (str, mesonlib.File)): - name = 'file {!r}'.format(str(src)) + if isinstance(src, str): + name = 'file {!r}'.format(os.path.join(state.subdir, src)) + elif isinstance(src, mesonlib.File): + name = 'file {!r}'.format(src.relative_name()) elif isinstance(src, build.CustomTarget): if len(src.get_outputs()) > 1: raise MesonException('windows.compile_resources does not accept custom targets with more than 1 output.') |