[{"id":12732,"web_url":"https://patchwork.libcamera.org/comment/12732/","msgid":"<20200924140559.GN3968@pendragon.ideasonboard.com>","date":"2020-09-24T14:05:59","subject":"Re: [libcamera-devel] [PATCH v2 09/11] Documentation: Move all\n\tdependencies into features","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Ricardo,\n\nThank you for the patch.\n\nOn Thu, Sep 24, 2020 at 09:19:20AM +0200, Ricardo Ribalda wrote:\n> This way if the user enables the documentation and the dependencies are\n> missing the configure fails.\n> \n> Suggested-by: Laurent Pinchart \n> Signed-off-by: Ricardo Ribalda \n\nNice :-)\n\nReviewed-by: Laurent Pinchart \n\n> ---\n> Documentation/meson.build | 6 +++---\n> meson.build | 4 +---\n> meson_options.txt | 2 +-\n> 3 files changed, 5 insertions(+), 7 deletions(-)\n> \n> diff --git a/Documentation/meson.build b/Documentation/meson.build\n> index 7b497ae..d3d64f7 100644\n> --- a/Documentation/meson.build\n> +++ b/Documentation/meson.build\n> @@ -7,8 +7,8 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc',\n> # Doxygen\n> #\n> \n> -doxygen = find_program('doxygen', required : false)\n> -dot = find_program('dot', required : false)\n> +doxygen = find_program('doxygen', required : get_option('documentation'))\n> +dot = find_program('dot', required : get_option('documentation'))\n> \n> if doxygen.found() and dot.found()\n> cdata = configuration_data()\n> @@ -42,7 +42,7 @@ endif\n> \n> sphinx = find_program('sphinx-build-3', required : false)\n> if not sphinx.found()\n> - sphinx = find_program('sphinx-build', required : false)\n> + sphinx = find_program('sphinx-build', required : get_option('documentation'))\n> endif\n> \n> if sphinx.found()\n> diff --git a/meson.build b/meson.build\n> index c58d458..992281c 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -108,9 +108,7 @@ subdir('utils')\n> # The documentation and test components are optional and can be disabled\n> # through configuration values. They are enabled by default.\n> \n> -if get_option('documentation')\n> - subdir('Documentation')\n> -endif\n> +subdir('Documentation')\n> \n> if get_option('test')\n> subdir('test')\n> diff --git a/meson_options.txt b/meson_options.txt\n> index d2e07ef..7f7b3e5 100644\n> --- a/meson_options.txt\n> +++ b/meson_options.txt\n> @@ -6,7 +6,7 @@ option('android',\n> description : 'Compile libcamera with Android Camera3 HAL interface')\n> \n> option('documentation',\n> - type : 'boolean',\n> + type : 'feature',\n> description : 'Generate the project documentation')\n> \n> option('gstreamer',","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8ED13C3B5C\n\tfor ;\n\tThu, 24 Sep 2020 14:06:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2732062FDA;\n\tThu, 24 Sep 2020 16:06:36 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C4BA60362\n\tfor ;\n\tThu, 24 Sep 2020 16:06:35 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4A8D42FD;\n\tThu, 24 Sep 2020 16:06:33 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Cs+2BXsy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600956394;\n\tbh=HVi+neYCas/MFzWleEwGQRO4lTzXNK8dh+yDIapEZOE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Cs+2BXsyDnpJQZC4twbkj5mj+q75mBJo78VHA5vHx6RGeBJJLZESSgjgwbH0QF5le\n\t0v3uw/9E4BC0ajXcDgFZbGOf3m45vR+/B9Dgz0l4XAiHEgcO1PCS3bTtF6+DYBbkCN\n\tj+DfaeOt46uBE3X0tKfd1Cqo3XqwfKUJUAv5SM7U=","Date":"Thu, 24 Sep 2020 17:05:59 +0300","From":"Laurent Pinchart ","To":"Ricardo Ribalda ","Message-ID":"<20200924140559.GN3968@pendragon.ideasonboard.com>","References":"<20200924071922.231063-1-ricardo@ribalda.com>\n\t<20200924071922.231063-10-ricardo@ribalda.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200924071922.231063-10-ricardo@ribalda.com>","Subject":"Re: [libcamera-devel] [PATCH v2 09/11] Documentation: Move all\n\tdependencies into features","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]