diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-28 18:04:46 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | 7c98ef9c86f5b04eb753cca9bbe60e5cfd7c0cc8 (patch) | |
| tree | 7e5bc31b6771bbc0ab364fd94e6808f47909066f | |
| parent | 3adde9ea4015de7d38490134f37c2ba07bc4133c (diff) | |
| download | gobject-introspection-7c98ef9c86f5b04eb753cca9bbe60e5cfd7c0cc8.tar.gz | |
meson: Remove gir_build hack option
gir generation now works in-tree, so we do not need to bootstrap g-i
by installing to a prefix first.
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/meson.build b/meson.build index acb4c8e9..244897c4 100644 --- a/meson.build +++ b/meson.build @@ -64,17 +64,13 @@ giounix_dep = dependency('gio-unix-2.0', version : glib_version, libffi_dep = dependency('libffi', fallback : ['libffi', 'ffi_dep']) -gir_build = get_option('gir_build') subdir('girepository') subdir('tools') subdir('giscanner') -if gir_build - ### To do in a second time - subdir('gir') -endif +subdir('gir') subdir('examples') subdir('docs') -### Missing meson.build file +### TODO ### subdir('tests') install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) diff --git a/meson_options.txt b/meson_options.txt index b2d7e1e7..28244208 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -17,7 +17,3 @@ option('gtk-doc', type: 'boolean', value: false, option('cairo-libname', type: 'string', description: 'Custom name for the cairo-gobject library name' ) - -option('gir_build', type: 'boolean', value : true, - description: 'Windows: post build (gir) stuff' -) |