From patchwork Thu Sep 24 07:19:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 9776 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 08A5CC3B5C for ; Thu, 24 Sep 2020 07:19:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C8B6662FD8; Thu, 24 Sep 2020 09:19:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UNsm5Ww0"; dkim-atps=neutral Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 827BD62FFF for ; Thu, 24 Sep 2020 09:19:43 +0200 (CEST) Received: by mail-wm1-x342.google.com with SMTP id e17so2421684wme.0 for ; Thu, 24 Sep 2020 00:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hgtoPMRRqiFZnbQV2BHKS+1MSojaHGMLHyWc0s81ID4=; b=UNsm5Ww01KOjMTXecIJHTt1SMnBuXR7QoVer/wpyBgRycyVANsHkzbGmXHHGgBNLwG yFrqZOhS/nv5cVhZYKRe5/imSTkSx6ae3eLxtMH6HDDd2Es466u7MAGeClU80X+OzKpA NZ6hTveIotmelBjWODXKKmkbC4fJ/3fB+2d1so4YfFacl/GJ5YnyEvgDrBmC8lVTRfT1 tGrEwZe8iqsel7lxwJHwnAa1rxR3lgTE01pU6rgeaNM7CziRRefMUkhC3mj79zXAWxke 1HNIhiWYRKb7z5AeSp1Qgj/KTlsQ4LyDEAQ/wbHb8E0l41aBM9mAyDZ319g/QErH3g63 g7Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hgtoPMRRqiFZnbQV2BHKS+1MSojaHGMLHyWc0s81ID4=; b=XD1mZsJsqTPsFYDnPLz1ykJty1X1jryIZgFFeRzwClAGO7f7Usi03FE74A0u1Lb7b8 KTr3yRqroQaCwAActfuVVfJ6OGasoDL5K0XW+wdhKcG2NpYvJRALTAIjAdbpnOFaSQOF cfmJGJYbvdl1tuDM+NexzeFYqLySD6HuQMLBTMXkRroUC2YRzy0Io0mxrHTpFTI5ekNO oXdqnD8lX+1Dwf6OoH9jX6HTbr6+fOlCVDnxHjr02hv638wiXW1JI2DnAbxeXZRHf4Je 29S4kw/lfMCLzNoFllEYmIt8POpbrO+SUM7H21bNr81/83pWf7C4tow1uEh/KWOxNAFZ DDTg== X-Gm-Message-State: AOAM531t25EpJxJ9OPNZ/UFx2Cbgxlfe52zL+CNz4fCKjHMSu11wHGaR pfViTGK+993jYId1CSsmkXaCyMK6XlLdGg== X-Google-Smtp-Source: ABdhPJzRysluMPluwraA3skzVNZNMwlZUIGsjKcNLxqa+4Y96oZFn6t7cpDutcT/59qiQyWz/719Hg== X-Received: by 2002:a1c:39c4:: with SMTP id g187mr3148376wma.126.1600931982608; Thu, 24 Sep 2020 00:19:42 -0700 (PDT) Received: from piling.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id z9sm2275393wmg.46.2020.09.24.00.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 00:19:41 -0700 (PDT) From: Ricardo Ribalda To: libcamera-devel@lists.libcamera.org, Kieran Bingham , Laurent Pinchart Date: Thu, 24 Sep 2020 09:19:20 +0200 Message-Id: <20200924071922.231063-10-ricardo@ribalda.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200924071922.231063-1-ricardo@ribalda.com> References: <20200924071922.231063-1-ricardo@ribalda.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 09/11] Documentation: Move all dependencies into features X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This way if the user enables the documentation and the dependencies are missing the configure fails. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- Documentation/meson.build | 6 +++--- meson.build | 4 +--- meson_options.txt | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index 7b497ae..d3d64f7 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 c58d458..992281c 100644 --- a/meson.build +++ b/meson.build @@ -108,9 +108,7 @@ subdir('utils') # 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 d2e07ef..7f7b3e5 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',