From patchwork Mon Jan 14 22:32:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 226 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 87D3C60B21 for ; Mon, 14 Jan 2019 23:32:53 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E5095510; Mon, 14 Jan 2019 23:32:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1547505173; bh=fHiPWj4Ti5pQuK0JCgnn/hxn4tlDU2uIzUQxOfAX3H8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SXFszd5RHEnxhtzZ9fDzEkhkZ9JjMCksJJicpR7F97cNzZ5HMJ5j8XiBDZoM/ib/g esIQPlXUWJ4rVu8n2Vqr/63nu8n3ACzHWE/sqq/cmz4ae1PnauemfO+YNv8Q5PW6eu KGOT12xt8Yg1wGMHMMhiGNlVW3HbpSS9eGcxNPC4= From: Kieran Bingham To: LibCamera Devel Date: Mon, 14 Jan 2019 22:32:48 +0000 Message-Id: <20190114223248.8643-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114100346.17925-1-kieran.bingham@ideasonboard.com> References: <20190114100346.17925-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH v2] meson: Utilise default compiler options X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 22:32:53 -0000 Remove our custom declarations for cpp_std=c++11, -Wall, -Wextra and -Werror, instead prefering to use the built-in default_option parameters from meson. Our custom compiler flags (such as -Wno-unused-parameter) are maintained. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- v2: - Remove duplicated -Wall, -Wextra flags which are provided at warning_level=2 meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 0ab0da981083..4465a3851a30 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,11 @@ project('libcamera', 'c', 'cpp', meson_version: '>= 0.40', version : '0.1', + default_options: [ + 'werror=true', + 'warning_level=2', + 'cpp_std=c++11', + ], license : 'LGPL 2.1+') # TODO: Extract this from project.version. @@ -9,15 +14,11 @@ project('libcamera', 'c', 'cpp', api_version = '0.1' common_arguments = [ - '-Wall', - '-Wextra', - '-Werror', '-Wno-unused-parameter', ] c_arguments = common_arguments cpp_arguments = common_arguments -cpp_arguments += '-std=c++11' add_project_arguments(c_arguments, language: 'c') add_project_arguments(cpp_arguments, language: 'cpp')