From patchwork Tue Jan 1 21:29:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 124 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B54E460B31 for ; Tue, 1 Jan 2019 22:29:52 +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 54382505; Tue, 1 Jan 2019 22:29:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1546378192; bh=TEJnxjI8ghCX294IOFqKWhhqxiq5mEL4rwgkVBVgbhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QngcpfRgL0wRxVhNbte2BnT0+uBmjoVZGUOtNSqWQfwMQx+Y+RWWIebj8khxjozOe CPPoNc9SoEUWjP4hnryHy3AY2/sQ75ZruY1x/wI3nz4lk2lOShrt5zZXIxfIznZIHF keg1vCwCETJQrumvXr+r2hwmG/Hp3+Xu/+4SJhDQ= From: Kieran Bingham To: LibCamera Devel Date: Tue, 1 Jan 2019 21:29:45 +0000 Message-Id: <20190101212947.28098-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190101212947.28098-1-kieran.bingham@ideasonboard.com> References: <20190101212947.28098-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 3/5] test: Move include definitions to libtest 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: Tue, 01 Jan 2019 21:29:53 -0000 With the libtest functionality moved to it's own library folder, the definitions for test inlcludes should reasonably live there too. The libtest subdir should always remain the first entry in the test/meson.build file. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- test/libtest/meson.build | 12 ++++++++++++ test/meson.build | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/libtest/meson.build b/test/libtest/meson.build index b998154dd8d3..e0893b70c3d4 100644 --- a/test/libtest/meson.build +++ b/test/libtest/meson.build @@ -5,3 +5,15 @@ libtest_sources = files([ libtest = static_library('libtest', libtest_sources) libtest_includes = include_directories('.') + +test_libraries = [libcamera, libtest] + +test_includes_public = [ + libtest_includes, + libcamera_includes, +] + +test_includes_internal = [ + test_includes_public, + libcamera_internal_includes, +] diff --git a/test/meson.build b/test/meson.build index bf8232f32787..9270a55e052a 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,17 +1,5 @@ subdir('libtest') -test_libraries = [libcamera, libtest] - -test_includes_public = [ - libtest_includes, - libcamera_includes, -] - -test_includes_internal = [ - test_includes_public, - libcamera_internal_includes, -] - subdir('media_device') public_tests = [