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

vs: link dependencies of link_whole targets 

Otherwise, msbuild will not create any output for targets that don't have
any sources.
This commit is contained in:
Nicolas Schneider 2019-02-13 20:30:45 +01:00
parent 9c55e50bea
commit 907fb59f67
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mesonbuild/backend/vs2010backend.py
View File

@ -89,6 +89,7 @@ class Vs2010Backend(backends.Backend):
self.vs_version = '2010' self.vs_version = '2010'
self.windows_target_platform_version = None self.windows_target_platform_version = None
self.subdirs = {} self.subdirs = {}
self.handled_target_deps = {}
def generate_custom_generator_commands(self, target, parent_node): def generate_custom_generator_commands(self, target, parent_node):
generator_output_files = [] generator_output_files = []
@ -436,10 +437,11 @@ class Vs2010Backend(backends.Backend):
def quote_arguments(self, arr): def quote_arguments(self, arr):
return ['"%s"' % i for i in arr] return ['"%s"' % i for i in arr]
def add_project_reference(self, root, include, projid): def add_project_reference(self, root, include, projid, link_outputs=False):
ig = ET.SubElement(root, 'ItemGroup') ig = ET.SubElement(root, 'ItemGroup')
pref = ET.SubElement(ig, 'ProjectReference', Include=include) pref = ET.SubElement(ig, 'ProjectReference', Include=include)
ET.SubElement(pref, 'Project').text = '{%s}' % projid ET.SubElement(pref, 'Project').text = '{%s}' % projid
if not link_outputs:
# Do not link in generated .lib files from dependencies automatically. # Do not link in generated .lib files from dependencies automatically.
# We only use the dependencies for ordering and link in the generated # We only use the dependencies for ordering and link in the generated
# objects and .lib files manually. # objects and .lib files manually.
@ -448,6 +450,9 @@ class Vs2010Backend(backends.Backend):
def add_target_deps(self, root, target): def add_target_deps(self, root, target):
target_dict = {target.get_id(): target} target_dict = {target.get_id(): target}
for name, dep in self.get_target_deps(target_dict).items(): for name, dep in self.get_target_deps(target_dict).items():
if dep.get_id() in self.handled_target_deps[target.get_id()]:
# This dependency was already handled manually.
continue
relpath = self.get_target_dir_relative_to(dep, target) relpath = self.get_target_dir_relative_to(dep, target)
vcxproj = os.path.join(relpath, dep.get_id() + '.vcxproj') vcxproj = os.path.join(relpath, dep.get_id() + '.vcxproj')
tid = self.environment.coredata.target_guids[dep.get_id()] tid = self.environment.coredata.target_guids[dep.get_id()]
@ -722,6 +727,7 @@ class Vs2010Backend(backends.Backend):
mlog.debug('Generating vcxproj %s.' % target.name) mlog.debug('Generating vcxproj %s.' % target.name)
entrypoint = 'WinMainCRTStartup' entrypoint = 'WinMainCRTStartup'
subsystem = 'Windows' subsystem = 'Windows'
self.handled_target_deps[target.get_id()] = []
if isinstance(target, build.Executable): if isinstance(target, build.Executable):
conftype = 'Application' conftype = 'Application'
if not target.gui_app: if not target.gui_app:
@ -1111,7 +1117,10 @@ class Vs2010Backend(backends.Backend):
trelpath = self.get_target_dir_relative_to(t, target) trelpath = self.get_target_dir_relative_to(t, target)
tvcxproj = os.path.join(trelpath, t.get_id() + '.vcxproj') tvcxproj = os.path.join(trelpath, t.get_id() + '.vcxproj')
tid = self.environment.coredata.target_guids[t.get_id()] tid = self.environment.coredata.target_guids[t.get_id()]
self.add_project_reference(root, tvcxproj, tid) self.add_project_reference(root, tvcxproj, tid, link_outputs=True)
# Mark the dependency as already handled to not have
# multiple references to the same target.
self.handled_target_deps[target.get_id()].append(t.get_id())
else: else:
# Other libraries go into AdditionalDependencies # Other libraries go into AdditionalDependencies
if linkname not in additional_links: if linkname not in additional_links: