diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-08-03 08:41:32 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-04 21:40:55 +0300 |
| commit | 44ac680e556ee32aff5bd007a9643b8281e4c548 (patch) | |
| tree | 25e7bb23540a309a50c033296f373bf89bcbc043 /mesonbuild/modules/gnome.py | |
| parent | 987539e2331f2c78e94cbcf3623a82a66dd52267 (diff) | |
| download | meson-44ac680e556ee32aff5bd007a9643b8281e4c548.zip meson-44ac680e556ee32aff5bd007a9643b8281e4c548.tar.gz meson-44ac680e556ee32aff5bd007a9643b8281e4c548.tar.bz2 | |
gtkdoc: Use find_program() to get gtkdoc tools
This will allow using gtk-doc as a subproject instead of having to
install it on the system. It also has the side effect of failing at
configuration time with a proper message if gtkdoc is not installed,
instead of failing at build time with a python backtrace.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 1ee98cc..dc5ef20 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -976,6 +976,11 @@ This will become a hard error in the future.''') '--modulename=' + modulename, '--moduleversion=' + moduleversion, '--mode=' + mode] + for tool in ['scan', 'scangobj', 'mkdb', 'mkhtml', 'fixxref']: + program_name = 'gtkdoc-' + tool + program = self.interpreter.find_program_impl(program_name) + path = program.held_object.get_path() + args.append('--{}={}'.format(program_name, path)) if namespace: args.append('--namespace=' + namespace) args += self._unpack_args('--htmlargs=', 'html_args', kwargs) |