aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-04-12 01:20:31 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-04-12 01:20:31 +0300
commit23ac32c19669148acc5652ec1d5a48c767fe58dc (patch)
treec9aeaedf2021e5764d4d1cd6e0c474ec87114668
parent55dba78889a7a09fdc5d6a2b0b2033861513824d (diff)
downloadmeson-23ac32c19669148acc5652ec1d5a48c767fe58dc.zip
meson-23ac32c19669148acc5652ec1d5a48c767fe58dc.tar.gz
meson-23ac32c19669148acc5652ec1d5a48c767fe58dc.tar.bz2
Moc tuning.
-rw-r--r--ninjabackend.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/ninjabackend.py b/ninjabackend.py
index 8215959..2a850be 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -817,7 +817,14 @@ class NinjaBackend(backends.Backend):
elem.add_item('rcc_flags', ['--name', basename])
elem.write(outfile)
if self.is_compilable_file(outfilename):
- src_deps.append(outfilename)
+ if rule.name == 'moc_hdr_compile' or rule.name == 'moc_src_compile':
+ manual_mocs = target.get_original_kwargs().get('manual_moc_include', [])
+ if src in manual_mocs:
+ other_deps.append(outfilename)
+ else:
+ src_deps.append(outfilename)
+ else:
+ src_deps.append(outfilename)
else:
other_deps.append(outfilename)
if rule.name == 'moc_src_compile': #HACK