Get generated headers from link_whole_targets as meson does for link_targets

pull/3195/head
Aleksey Filippov 7 years ago
parent bcd076276e
commit bf0e01d779
  1. 3
      mesonbuild/backend/ninjabackend.py

@ -14,6 +14,7 @@
import os, pickle, re, shlex, subprocess import os, pickle, re, shlex, subprocess
from collections import OrderedDict from collections import OrderedDict
import itertools
from pathlib import PurePath from pathlib import PurePath
from . import backends from . import backends
@ -263,7 +264,7 @@ int dummy;
vala_header = File.from_built_file(self.get_target_dir(target), target.vala_header) vala_header = File.from_built_file(self.get_target_dir(target), target.vala_header)
header_deps.append(vala_header) header_deps.append(vala_header)
# Recurse and find generated headers # Recurse and find generated headers
for dep in target.link_targets: for dep in itertools.chain(target.link_targets, target.link_whole_targets):
if isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): if isinstance(dep, (build.StaticLibrary, build.SharedLibrary)):
header_deps += self.get_generated_headers(dep) header_deps += self.get_generated_headers(dep)
return header_deps return header_deps

Loading…
Cancel
Save