summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-06-07 18:01:39 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2018-06-07 18:11:49 +0100
commit884f38fe1b8a005d494be39049a2378e964f0948 (patch)
tree7353c7868a25cb8099ebab82fc13eb87de6bdf35
parente581a8937f290fada2eaecc95c978aa6db8e3a2f (diff)
downloadmeson-884f38fe1b8a005d494be39049a2378e964f0948.tar.gz
Use a unique name for windows resource compilation custom target
-rw-r--r--mesonbuild/modules/windows.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index fb5bacfc1..7dd87f245 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.')