aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-07-01 14:43:51 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-07-01 20:50:47 +0530
commitf564bf9af086f9883224b0d17da0521be6d762d7 (patch)
treebc35aac5980d64315174e8c5afd955b4703fd377
parent80486563bf1b2527b59c419ad468f64c6d5c7dca (diff)
downloadmeson-f564bf9af086f9883224b0d17da0521be6d762d7.zip
meson-f564bf9af086f9883224b0d17da0521be6d762d7.tar.gz
meson-f564bf9af086f9883224b0d17da0521be6d762d7.tar.bz2
vs: Add include dirs required by dependencies
Also ensure that they're translated from UNIX to native as required
-rw-r--r--mesonbuild/backend/vs2010backend.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 86d9a7c..b8a144f 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -506,10 +506,14 @@ class Vs2010Backend(backends.Backend):
# here.
general_args += compiler.get_option_compile_args(self.environment.coredata.compiler_options)
for d in target.get_external_deps():
- try:
- general_args += d.compile_args
- except AttributeError:
- pass
+ # Cflags required by external deps might have UNIX-specific flags,
+ # so filter them out if needed
+ d_compile_args = compiler.unix_compile_flags_to_native(d.get_compile_args())
+ for arg in d_compile_args:
+ if arg.startswith('-I'):
+ inc_dirs.append(arg[2:])
+ else:
+ general_args.append(arg)
for l, args in extra_args.items():
extra_args[l] = [Vs2010Backend.quote_define_cmdline(x) for x in args]