diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-29 22:45:45 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-29 22:45:45 +0300 |
| commit | 833520afb584cfa887a133c5af1858a046ba6867 (patch) | |
| tree | 27053737617863d1b716e23f3793e1232249894e | |
| parent | 1d89d091f89986b4a5c04614c08e8c6928ff4432 (diff) | |
| parent | 30e2a5feae6a4b8fd9106e6376e07e168d0af52e (diff) | |
| download | meson-833520afb584cfa887a133c5af1858a046ba6867.zip meson-833520afb584cfa887a133c5af1858a046ba6867.tar.gz meson-833520afb584cfa887a133c5af1858a046ba6867.tar.bz2 | |
Merge branch 'vs-fixinclude'
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 0f4927e..d345f3d 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -449,11 +449,8 @@ class Vs2010Backend(backends.Backend): clconf = ET.SubElement(compiles, 'ClCompile') opt = ET.SubElement(clconf, 'Optimization') opt.text = 'disabled' - inc_dirs = [proj_to_src_dir, self.get_target_private_dir(target)] - cur_dir = target.subdir - if cur_dir == '': - cur_dir= '.' - inc_dirs.append(cur_dir) + inc_dirs = ['.', self.relpath(self.get_target_private_dir(target), self.get_target_dir(target)), + proj_to_src_dir] extra_args = {'c': [], 'cpp': []} for l, args in self.environment.coredata.external_args.items(): |