Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove redudant checks in vs2010 backend 

- Implicit include dirs was checked twice in a row
- Add define only if it does not yet exist rather than remove.
This commit is contained in:
Vili Väinölä 2020-09-13 07:56:24 +03:00 committed by Nirbheek Chauhan
parent 25ad10e501
commit 416b47c915
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mesonbuild/backend/vs2010backend.py
View File

@ -966,9 +966,7 @@ class Vs2010Backend(backends.Backend):
t_inc_dirs = [self.relpath(self.get_target_private_dir(target), t_inc_dirs = [self.relpath(self.get_target_private_dir(target),
self.get_target_dir(target))] self.get_target_dir(target))]
if target.implicit_include_directories: if target.implicit_include_directories:
t_inc_dirs += ['.'] t_inc_dirs += ['.', proj_to_src_dir]
if target.implicit_include_directories:
t_inc_dirs += [proj_to_src_dir]
args += ['-I' + arg for arg in t_inc_dirs] args += ['-I' + arg for arg in t_inc_dirs]
# Split preprocessor defines and include directories out of the list of # Split preprocessor defines and include directories out of the list of
@ -983,9 +981,8 @@ class Vs2010Backend(backends.Backend):
else: else:
define = arg[2:] define = arg[2:]
# De-dup # De-dup
if define in file_defines[l]: if define not in file_defines[l]:
file_defines[l].remove(define) file_defines[l].append(define)
file_defines[l].append(define)
elif arg.startswith(('-I', '/I')) or arg == '%(AdditionalIncludeDirectories)': elif arg.startswith(('-I', '/I')) or arg == '%(AdditionalIncludeDirectories)':
file_args[l].remove(arg) file_args[l].remove(arg)
# Don't escape the marker # Don't escape the marker