NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Documentation: Move all dependencies into features

Browse source 
This way if the user enables the documentation and the dependencies are
missing the configure fails.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Ricardo Ribalda 2020-09-24 09:19:20 +02:00 • committed by Laurent Pinchart
parent 4e998cea15
commit aba567338b
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Documentation/meson.build
View file

@ -7,8 +7,8 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc',
# Doxygen # Doxygen
# #
doxygen = find_program('doxygen', required : false) doxygen = find_program('doxygen', required : get_option('documentation'))
dot = find_program('dot', required : false) dot = find_program('dot', required : get_option('documentation'))
if doxygen.found() and dot.found() if doxygen.found() and dot.found()
cdata = configuration_data() cdata = configuration_data()
@ -42,7 +42,7 @@ endif
sphinx = find_program('sphinx-build-3', required : false) sphinx = find_program('sphinx-build-3', required : false)
if not sphinx.found() if not sphinx.found()
sphinx = find_program('sphinx-build', required : false) sphinx = find_program('sphinx-build', required : get_option('documentation'))
endif endif
if sphinx.found() if sphinx.found()

2
meson.build
View file

@ -110,9 +110,7 @@ subdir('src')
# The documentation and test components are optional and can be disabled # The documentation and test components are optional and can be disabled
# through configuration values. They are enabled by default. # through configuration values. They are enabled by default.
if get_option('documentation')
subdir('Documentation') subdir('Documentation')
endif
if get_option('test') if get_option('test')
subdir('test') subdir('test')

2
meson_options.txt
View file

@ -6,7 +6,7 @@ option('android',
description : 'Compile libcamera with Android Camera3 HAL interface') description : 'Compile libcamera with Android Camera3 HAL interface')
option('documentation', option('documentation',
type : 'boolean', type : 'feature',
description : 'Generate the project documentation') description : 'Generate the project documentation')
option('gstreamer', option('gstreamer',