From patchwork Mon Jan 14 10:03:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 225 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 54AD360B31 for ; Mon, 14 Jan 2019 11:03:50 +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 EB7E5505; Mon, 14 Jan 2019 11:03:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1547460230; bh=ne4NRxeRrpnRUAIQrr6UP9hKY9khhrh2LxwIhVsZymM=; h=From:To:Cc:Subject:Date:From; b=s2azKaI22jtr636a3JoyUBhTJivEVYW31XbYkGDpNqbkNnasNCOvj+m94N5rFIBdQ +JLDvZzDmLs+5ciJKCkcUk1Lxcyzt4+lI0FmOWuBNW/aJVgZLvoCXUL2XuF5tl3LMJ uMljeMMygSpGsM5xQzpj1M0x1wrYohpXlCX8QYIc= From: Kieran Bingham To: LibCamera Devel Date: Mon, 14 Jan 2019 10:03:46 +0000 Message-Id: <20190114100346.17925-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 Subject: [libcamera-devel] [PATCH] 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 10:03:50 -0000 Remove our custom declarations for cpp_std=c++11 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. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0ab0da981083..37640c39f5b8 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. @@ -11,13 +16,11 @@ 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')