aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGoaLitiuM <goalitium@kapsi.fi>2018-08-18 14:12:53 +0300
committerGoaLitiuM <goalitium@kapsi.fi>2018-08-20 22:27:31 +0300
commit9d5448ab45a7e553fe6063a2f0350451b3b55149 (patch)
tree6bea3a280e54616b7fb46778b66a1dabaab77a86
parent4a1d64cb6cb8c75cf98b6d5bc36c9634abc26f19 (diff)
downloadmeson-9d5448ab45a7e553fe6063a2f0350451b3b55149.zip
meson-9d5448ab45a7e553fe6063a2f0350451b3b55149.tar.gz
meson-9d5448ab45a7e553fe6063a2f0350451b3b55149.tar.bz2
Normalize string constructs of d_import_dirs paths
Fixes skipped deprecation warnings of badly constructed d_import_dirs on Windows.
-rw-r--r--mesonbuild/interpreter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 707cf9e..c0f3745 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3929,7 +3929,7 @@ Try setting b_lundef to false instead.''')
# BW compatibility. This was permitted so we must support it
# for a few releases so people can transition to "correct"
# path declarations.
- if i.startswith(self.environment.get_source_dir()):
+ if os.path.normpath(i).startswith(self.environment.get_source_dir()):
mlog.warning('''Building a path to the source dir is not supported. Use a relative path instead.
This will become a hard error in the future.''')
i = os.path.relpath(i, os.path.join(self.environment.get_source_dir(), self.subdir))