sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

doc: add missing files and use full paths (#2822)

Browse Source 
* doc: add missing files and use full paths

It seems that private_headers didn't work for out-of-tree builds.
This commit makes it use full paths and adds a few missing files.

* cplusplus: use the correct `install_dir` for the Doxygen docs
This commit is contained in:
Kleis Auke Wolthuizen 2022-05-26 09:48:31 +02:00 committed by GitHub
parent 111eef0049
commit a96dd73648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cplusplus/meson.build
View File

@ -59,6 +59,6 @@ if get_option('doxygen')
output: 'html', output: 'html',
command: [doxygen, doxyfile], command: [doxygen, doxyfile],
install: true, install: true,
install_dir: get_option('prefix') / get_option('datadir') / 'doc' / 'libvips-doc' install_dir: get_option('prefix') / get_option('datadir') / 'doc' / 'vips-doc'
) )
endif endif

16
doc/meson.build
View File

@ -1,4 +1,4 @@
private_headers = [ private_libvips_headers = [
'include/vips/almostdeprecated.h', 'include/vips/almostdeprecated.h',
'include/vips/deprecated.h', 'include/vips/deprecated.h',
'include/vips/vips7compat.h', 'include/vips/vips7compat.h',
@ -34,7 +34,11 @@ private_headers = [
'foreign/jpeg.h', 'foreign/jpeg.h',
'foreign/magick.h', 'foreign/magick.h',
'foreign/pforeign.h', 'foreign/pforeign.h',
'foreign/quantise.h',
'foreign/tiff.h', 'foreign/tiff.h',
'foreign/libnsgif/lzw.h',
'foreign/libnsgif/nsgif.h',
'foreign/libnsgif/test/cli.h',
'freqfilt/pfreqfilt.h', 'freqfilt/pfreqfilt.h',
'histogram/hist_unary.h', 'histogram/hist_unary.h',
'histogram/phistogram.h', 'histogram/phistogram.h',
@ -47,6 +51,11 @@ private_headers = [
'resample/templates.h' 'resample/templates.h'
] ]
private_headers = []
foreach private_libvips_header : private_libvips_headers
private_headers += [join_paths(meson.project_source_root(), 'libvips', private_libvips_header)]
endforeach
markdown_content_files = files( markdown_content_files = files(
'How-it-works.md', 'How-it-works.md',
'libvips-from-C++.md', 'libvips-from-C++.md',
@ -109,7 +118,10 @@ docpath = get_option('prefix') / get_option('datadir') / 'gtk-doc' / 'html'
gnome.gtkdoc('libvips', gnome.gtkdoc('libvips',
mode: 'none', mode: 'none',
main_xml: 'libvips-docs.xml.in', main_xml: 'libvips-docs.xml.in',
src_dir: include_directories('../libvips'), src_dir: [
join_paths(meson.project_source_root(), 'libvips'),
join_paths(meson.project_build_root(), 'libvips'),
],
dependencies: libvips_dep, dependencies: libvips_dep,
scan_args: [ scan_args: [
'--ignore-headers=' + ' '.join(private_headers), '--ignore-headers=' + ' '.join(private_headers),