And the custom rules too.

pull/15/head
Jussi Pakkanen 11 years ago
parent d2b5e5c7a5
commit f1cc633799
  1. 6
      dependencies.py
  2. 4
      ninjabackend.py

@ -529,17 +529,17 @@ class Qt5Dependency(Dependency):
return True
def get_generate_rules(self):
moc_rule = CustomRule([self.moc.get_command(), '$mocflags', '@INFILE@', '-o', '@OUTFILE@'],
moc_rule = CustomRule([self.moc.get_command(), '$mocargs', '@INFILE@', '-o', '@OUTFILE@'],
'moc_@BASENAME@.cpp', 'moc_headers', 'moc_hdr_compile',
'Compiling header @INFILE@ with the moc preprocessor')
mocsrc_rule = CustomRule([self.moc.get_command(), '$mocflags', '@INFILE@', '-o', '@OUTFILE@'],
mocsrc_rule = CustomRule([self.moc.get_command(), '$mocargs', '@INFILE@', '-o', '@OUTFILE@'],
'@BASENAME@.moc', 'moc_sources', 'moc_src_compile',
'Compiling source @INFILE@ with the moc preprocessor')
ui_rule = CustomRule([self.uic.get_command(), '@INFILE@', '-o', '@OUTFILE@'],
'ui_@BASENAME@.h', 'ui_files', 'ui_compile',
'Compiling @INFILE@ with the ui compiler')
rrc_rule = CustomRule([self.rcc.get_command(), '@INFILE@', '-o', '@OUTFILE@',
'${rcc_flags}'], '@BASENAME@.cpp','qresources',
'${rcc_args}'], '@BASENAME@.cpp','qresources',
'rc_compile', 'Compiling @INFILE@ with the rrc compiler')
return [moc_rule, mocsrc_rule, ui_rule, rrc_rule]

@ -966,9 +966,9 @@ class NinjaBackend(backends.Backend):
infilename = os.path.join(self.build_to_src, target.get_source_subdir(), src)
elem = NinjaBuildElement(outfilename, rule.name, infilename)
if rule.name == 'rc_compile':
elem.add_item('rcc_flags', ['--name', basename])
elem.add_item('rcc_args', ['--name', basename])
if rule.name == 'moc_hdr_compile' or rule.name == 'moc_src_compile':
elem.add_item('mocflags', ['-I', target.subdir])
elem.add_item('mocargs', ['-I', target.subdir])
elem.write(outfile)
if self.is_compilable_file(outfilename):
if rule.name == 'moc_hdr_compile' or rule.name == 'moc_src_compile':

Loading…
Cancel
Save