diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-07 18:01:39 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-07 18:11:49 +0100 |
| commit | 884f38fe1b8a005d494be39049a2378e964f0948 (patch) | |
| tree | 7353c7868a25cb8099ebab82fc13eb87de6bdf35 /mesonbuild/modules/windows.py | |
| parent | e581a8937f290fada2eaecc95c978aa6db8e3a2f (diff) | |
| download | meson-884f38fe1b8a005d494be39049a2378e964f0948.zip meson-884f38fe1b8a005d494be39049a2378e964f0948.tar.gz meson-884f38fe1b8a005d494be39049a2378e964f0948.tar.bz2 | |
Use a unique name for windows resource compilation custom target
Diffstat (limited to 'mesonbuild/modules/windows.py')
| -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.') |