From patchwork Mon Jun 22 13:29:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 4107 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 429F5603BD for ; Mon, 22 Jun 2020 15:29:54 +0200 (CEST) X-Halon-ID: 62bd2bf9-b48c-11ea-86ee-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 62bd2bf9-b48c-11ea-86ee-0050569116f7; Mon, 22 Jun 2020 15:29:26 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 22 Jun 2020 15:29:48 +0200 Message-Id: <20200622132948.1398048-1-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3] meson: options: Add an option to control compilation of qcam 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: , X-List-Received-Date: Mon, 22 Jun 2020 13:29:54 -0000 Add an option to control compilation of the qcam test application. The default behavior is to compile qcam, no change in behavior without user intervention. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- * Changes since v2 - Default to auto instead of enabled. * Changes since v1 - Sort options alphabetical in meson_options.txt - Use feature instead of boolean and attach it to the qt5_dep --- meson_options.txt | 5 +++++ src/qcam/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index badace151bb62bc9..e9e815fde366c89d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -19,6 +19,11 @@ option('pipelines', choices : ['ipu3', 'raspberrypi', 'rkisp1', 'simple', 'uvcvideo', 'vimc'], description : 'Select which pipeline handlers to include') +option('qcam', + type : 'feature', + value : 'auto', + description : 'Compile the qcam test application') + option('test', type : 'boolean', description: 'Compile and include the tests') diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 045db52acf26d71b..6ea886a32236d40f 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -22,7 +22,7 @@ qt5 = import('qt5') qt5_dep = dependency('qt5', method : 'pkg-config', modules : ['Core', 'Gui', 'Widgets'], - required : false) + required : get_option('qcam')) if qt5_dep.found() qcam_deps = [