backend/vs: process link dependencies.

Partially-Fixes: #1799
pull/9347/head
Andres Freund 3 years ago committed by Eli Schwartz
parent a1542720f4
commit a161873948
  1. 10
      mesonbuild/backend/vs2010backend.py
  2. 5
      test cases/common/144 link depends custom target/meson.build
  3. 5
      test cases/common/226 link depends indexed custom target/meson.build
  4. 5
      test cases/windows/10 vs module defs generated custom target/meson.build

@ -280,6 +280,16 @@ class Vs2010Backend(backends.Backend):
all_deps[ldep.get_id()] = ldep.target
else:
all_deps[ldep.get_id()] = ldep
for ldep in target.link_depends:
if isinstance(ldep, build.CustomTargetIndex):
all_deps[ldep.get_id()] = ldep.target
elif isinstance(ldep, File):
# Already built, no target references needed
pass
else:
all_deps[ldep.get_id()] = ldep
for obj_id, objdep in self.get_obj_target_deps(target.objects):
all_deps[obj_id] = objdep
else:

@ -1,10 +1,5 @@
project('link_depends_custom_target', 'c')
if meson.backend().startswith('vs')
# FIXME: Broken on the VS backends
error('MESON_SKIP_TEST see https://github.com/mesonbuild/meson/issues/1799')
endif
cmd = find_program('make_file.py')
dep_file = custom_target('gen_dep',

@ -1,10 +1,5 @@
project('link_depends_indexed_custom_target', 'c')
if meson.backend().startswith('vs')
# FIXME: Broken on the VS backends
error('MESON_SKIP_TEST see https://github.com/mesonbuild/meson/issues/1799')
endif
cmd = find_program('make_file.py')
dep_files = custom_target('gen_dep',

@ -1,10 +1,5 @@
project('generated_dll_module_defs', 'c')
if meson.backend().startswith('vs')
# FIXME: Broken on the VS backends
error('MESON_SKIP_TEST see https://github.com/mesonbuild/meson/issues/1799')
endif
subdir('subdir')
exe = executable('prog', 'prog.c', link_with : shlib)
test('runtest', exe)

Loading…
Cancel
Save