summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Ribalda <ricardo@ribalda.com>2020-09-24 09:19:20 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-09-24 21:08:30 +0300
commitaba567338b25c8cefe9e9e257d34ad3a61776276 (patch)
treeb46c8f2690d89542811bb4171d7f5b7ef190bc54
parent4e998cea15cf3d962473aa5faab99f939d9dc0dd (diff)
Documentation: Move all dependencies into features
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>
-rw-r--r--Documentation/meson.build6
-rw-r--r--meson.build4
-rw-r--r--meson_options.txt2
3 files changed, 5 insertions, 7 deletions
diff --git a/Documentation/meson.build b/Documentation/meson.build
index 7b497aee..d3d64f71 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -7,8 +7,8 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc',
# Doxygen
#
-doxygen = find_program('doxygen', required : false)
-dot = find_program('dot', required : false)
+doxygen = find_program('doxygen', required : get_option('documentation'))
+dot = find_program('dot', required : get_option('documentation'))
if doxygen.found() and dot.found()
cdata = configuration_data()
@@ -42,7 +42,7 @@ endif
sphinx = find_program('sphinx-build-3', required : false)
if not sphinx.found()
- sphinx = find_program('sphinx-build', required : false)
+ sphinx = find_program('sphinx-build', required : get_option('documentation'))
endif
if sphinx.found()
diff --git a/meson.build b/meson.build
index dd71390b..6d750141 100644
--- a/meson.build
+++ b/meson.build
@@ -110,9 +110,7 @@ subdir('src')
# The documentation and test components are optional and can be disabled
# through configuration values. They are enabled by default.
-if get_option('documentation')
- subdir('Documentation')
-endif
+subdir('Documentation')
if get_option('test')
subdir('test')
diff --git a/meson_options.txt b/meson_options.txt
index d2e07ef1..7f7b3e59 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,7 +6,7 @@ option('android',
description : 'Compile libcamera with Android Camera3 HAL interface')
option('documentation',
- type : 'boolean',
+ type : 'feature',
description : 'Generate the project documentation')
option('gstreamer',