modules/gnome: auto-set girepository directory

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
pull/61/head
Igor Gnatenko 10 years ago
parent 78d31cafd7
commit f94fc2f497
  1. 1
      modules/gnome.py
  2. 3
      test cases/frameworks/7 gnome/gir/meson.build
  3. 2
      test cases/frameworks/7 gnome/installed_files.txt

@ -70,6 +70,7 @@ class GnomeModule:
typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@'] typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@']
kwargs['output'] = typelib_output kwargs['output'] = typelib_output
kwargs['command'] = typelib_cmd kwargs['command'] = typelib_cmd
kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0')
typelib_target = build.CustomTarget(typelib_name, state.subdir, kwargs) typelib_target = build.CustomTarget(typelib_name, state.subdir, kwargs)
return [scan_target, typelib_target] return [scan_target, typelib_target]

@ -8,8 +8,7 @@ gnome.generate_gir(girexe,
sources : libsources, sources : libsources,
nsversion : '1.0', nsversion : '1.0',
namespace : 'Meson', namespace : 'Meson',
install : true, install : true
install_dir : 'typelibdir',
) )
test('gobject introspection', girexe) test('gobject introspection', girexe)

@ -1,2 +1,2 @@
usr/typelibdir/Meson-1.0.typelib usr/lib/girepository-1.0/Meson-1.0.typelib
usr/share/glib-2.0/schemas/com.github.meson.gschema.xml usr/share/glib-2.0/schemas/com.github.meson.gschema.xml

Loading…
Cancel
Save