gdbus_codegen: Fix custom target name

The namebase which is used as the target name, also holds part of
the file names. This used in combination generates files with wrong
names.
pull/2930/head
Iñigo Martínez 7 years ago
parent d7b401f7d7
commit e656b9c819
  1. 7
      mesonbuild/modules/gnome.py

@ -873,9 +873,10 @@ This will become a hard error in the future.''')
def gdbus_codegen(self, state, args, kwargs):
if len(args) != 2:
raise MesonException('Gdbus_codegen takes two arguments, name and xml file.')
namebase = args[0] + '-gdbus'
namebase = args[0]
xml_file = args[1]
cmd = [find_program('gdbus-codegen', namebase)]
target_name = namebase + '-gdbus'
cmd = [find_program('gdbus-codegen', target_name)]
if 'interface_prefix' in kwargs:
cmd += ['--interface-prefix', kwargs.pop('interface_prefix')]
if 'namespace' in kwargs:
@ -954,7 +955,7 @@ This will become a hard error in the future.''')
'command': cmd,
'build_by_default': build_by_default
}
ct = build.CustomTarget(namebase, state.subdir, state.subproject, custom_kwargs)
ct = build.CustomTarget(target_name, state.subdir, state.subproject, custom_kwargs)
# Ensure that the same number (and order) of arguments are returned
# regardless of the gdbus-codegen (glib) version being used
targets = [ct, ct]

Loading…
Cancel
Save