diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-17 18:16:14 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-17 18:16:14 +0000 |
| commit | b9f17cf0a39bde2173ec274e3d1bac6bcc20c378 (patch) | |
| tree | 6b11de82964dee33b39fcec5fdef862c6ca70e29 | |
| parent | 0ae28e564acc3cae564c7012dc749338cb9db32e (diff) | |
| parent | f7c30105fb850a2b35a09924e8782e7a7734a79d (diff) | |
| download | gobject-introspection-b9f17cf0a39bde2173ec274e3d1bac6bcc20c378.tar.gz | |
Merge branch 'find_program_override' into 'master'
Don't override finding executables when using pre-built tools.
See merge request GNOME/gobject-introspection!212
| -rw-r--r-- | gir/meson.build | 26 | ||||
| -rw-r--r-- | tools/meson.build | 13 |
2 files changed, 17 insertions, 22 deletions
diff --git a/gir/meson.build b/gir/meson.build index c4270f1e..b37fdb81 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -41,24 +41,14 @@ gir_files = [ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') install_data(gir_files, install_dir: girdir) -if get_option('gi_cross_use_prebuilt_gi') - scanner_command = [ - 'g-ir-scanner', - ] -else - scanner_command = [ - python, - girscanner, - ] -endif - -scanner_command += [ - '--output=@OUTPUT@', - '--no-libtool', - '--quiet', - '--reparse-validate', - '--add-include-path', join_paths(meson.current_build_dir()), - '--add-include-path', join_paths(meson.current_source_dir()), +scanner_command = [ + find_program('g-ir-scanner', native: true), + '--output=@OUTPUT@', + '--no-libtool', + '--quiet', + '--reparse-validate', + '--add-include-path', join_paths(meson.current_build_dir()), + '--add-include-path', join_paths(meson.current_source_dir()), ] dep_type = glib_dep.type_name() diff --git a/tools/meson.build b/tools/meson.build index 2d67d6ef..f272c955 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -33,7 +33,9 @@ foreach tool : tools ) tool_output += tool_bin # Provide tools for others when we're a subproject and they use the Meson GNOME module - meson.override_find_program(tool[0], tool_bin) + if not get_option('gi_cross_use_prebuilt_gi') + meson.override_find_program(tool[0], tool_bin) + endif endforeach girscanner = tool_output[0] @@ -57,7 +59,6 @@ gircompiler = executable('g-ir-compiler', 'compiler.c', install: true, c_args: custom_c_args, ) -meson.override_find_program('g-ir-compiler', gircompiler) girgenerate = executable('g-ir-generate', 'generate.c', dependencies: [ @@ -67,11 +68,15 @@ girgenerate = executable('g-ir-generate', 'generate.c', install: true, c_args: custom_c_args, ) -meson.override_find_program('g-ir-generate', girgenerate) girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', dependencies: girepo_dep, install: true, c_args: custom_c_args, ) -meson.override_find_program('g-ir-inspect', girinspect) + +if not get_option('gi_cross_use_prebuilt_gi') + meson.override_find_program('g-ir-compiler', gircompiler) + meson.override_find_program('g-ir-generate', girgenerate) + meson.override_find_program('g-ir-inspect', girinspect) +endif |