diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-23 00:21:40 +0300 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-23 00:21:55 +0300 |
| commit | f94fc2f497c22bd28b5f04ec58c97e0f4d95486f (patch) | |
| tree | fc01c8cbaad62c0f0cf013c9698f53ad7d49106b | |
| parent | 78d31cafd73ef7df0e842efc822a8778fe4f9761 (diff) | |
| download | meson-f94fc2f497c22bd28b5f04ec58c97e0f4d95486f.zip meson-f94fc2f497c22bd28b5f04ec58c97e0f4d95486f.tar.gz meson-f94fc2f497c22bd28b5f04ec58c97e0f4d95486f.tar.bz2 | |
modules/gnome: auto-set girepository directory
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | modules/gnome.py | 1 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/gir/meson.build | 3 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/installed_files.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/gnome.py b/modules/gnome.py index c0e391f..ef5f6b8 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -70,6 +70,7 @@ class GnomeModule: typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@'] kwargs['output'] = typelib_output 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) return [scan_target, typelib_target] diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build index 115631e..cb3308e 100644 --- a/test cases/frameworks/7 gnome/gir/meson.build +++ b/test cases/frameworks/7 gnome/gir/meson.build @@ -8,8 +8,7 @@ gnome.generate_gir(girexe, sources : libsources, nsversion : '1.0', namespace : 'Meson', -install : true, -install_dir : 'typelibdir', +install : true ) test('gobject introspection', girexe) diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt index 019b81a..4267c26 100644 --- a/test cases/frameworks/7 gnome/installed_files.txt +++ b/test cases/frameworks/7 gnome/installed_files.txt @@ -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 |