diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2019-08-13 09:33:42 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2019-08-13 09:34:25 -0400 |
| commit | 172a355b93e8ae2c4164a7ee3824480f76a2a8ae (patch) | |
| tree | f386635df7e8e5bbe68d0834aee2618508790b25 | |
| parent | 0ab3d97566e8876532ecaf31b948a9ae3337b564 (diff) | |
| download | meson-172a355b93e8ae2c4164a7ee3824480f76a2a8ae.zip meson-172a355b93e8ae2c4164a7ee3824480f76a2a8ae.tar.gz meson-172a355b93e8ae2c4164a7ee3824480f76a2a8ae.tar.bz2 | |
Revert "gnome: Use find_program() to get glib-compile-resources"
This reverts commit 0ab3d97566e8876532ecaf31b948a9ae3337b564.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 4f6c20f..dc5ef20 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -105,8 +105,7 @@ class GnomeModule(ExtensionModule): self.__print_gresources_warning(state) glib_version = self._get_native_glib_version(state) - glib_compile_resources = self.interpreter.find_program_impl('glib-compile-resources') - cmd = [glib_compile_resources, '@INPUT@'] + cmd = ['glib-compile-resources', '@INPUT@'] source_dirs, dependencies = mesonlib.extract_as_list(kwargs, 'source_dir', 'dependencies', pop=True) @@ -152,7 +151,7 @@ class GnomeModule(ExtensionModule): else: raise MesonException('Invalid file argument: {!r}'.format(ifile)) - depend_files, depends, subdirs = self._get_gresource_dependencies(glib_compile_resources, + depend_files, depends, subdirs = self._get_gresource_dependencies( state, ifile, source_dirs, dependencies) # Make source dirs relative to build dir now @@ -225,9 +224,9 @@ class GnomeModule(ExtensionModule): rv = [target_c, target_h] return ModuleReturnValue(rv, rv) - def _get_gresource_dependencies(self, glib_compile_resources, state, input_file, source_dirs, dependencies): + def _get_gresource_dependencies(self, state, input_file, source_dirs, dependencies): - cmd = [glib_compile_resources.held_object.get_path(), + cmd = ['glib-compile-resources', input_file, '--generate-dependencies'] |