diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-17 16:59:00 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-17 16:59:00 +0000 |
| commit | 0ae28e564acc3cae564c7012dc749338cb9db32e (patch) | |
| tree | 628513e5afbbe872505475c4e6d23264112bc8c2 | |
| parent | 4d5c6f45e47fc04f2b18eb8d6e0f4997d5b89c59 (diff) | |
| parent | db136cbaf88a86081f29afbba3c98eaf006842ac (diff) | |
| download | gobject-introspection-0ae28e564acc3cae564c7012dc749338cb9db32e.tar.gz | |
Merge branch 'fix-option-naming' into 'master'
Rename option `gi_cross_use_{host -> prebuilt}_gi`
See merge request GNOME/gobject-introspection!211
| -rw-r--r-- | gir/meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gir/meson.build b/gir/meson.build index 04f9371a..c4270f1e 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -41,7 +41,7 @@ gir_files = [ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') install_data(gir_files, install_dir: girdir) -if get_option('gi_cross_use_host_gi') +if get_option('gi_cross_use_prebuilt_gi') scanner_command = [ 'g-ir-scanner', ] diff --git a/meson_options.txt b/meson_options.txt index 20ccc3b9..dff9be8e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,8 +26,8 @@ option('gir_dir_prefix', type: 'string', description: 'Intermediate prefix for gir installation under ${prefix}' ) -option('gi_cross_use_host_gi', type: 'boolean', value : false, - description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)' +option('gi_cross_use_prebuilt_gi', type: 'boolean', value : false, + description: 'Use gobject introspection tools installed in the build system (useful when cross-compiling)' ) option('gi_cross_binary_wrapper', type: 'string', |