[gobject-introspection/wip/meson: 10/14] meson: Remove gir_build hack option
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/wip/meson: 10/14] meson: Remove gir_build hack option
- Date: Thu, 30 Nov 2017 17:14:32 +0000 (UTC)
commit cbcc8a85e2a7068567b3a24d6408b8801ce055a9
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Tue Nov 28 18:04:46 2017 +0530
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.
meson.build | 8 ++------
meson_options.txt | 4 ----
2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index acb4c8e..244897c 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 b2d7e1e..2824420 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'
-)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]