From 3900b0771ecb160f26a24b4a9bf72e827256e7da Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 20 Dec 2018 15:40:37 +0000 Subject: test: Move test objects to libtest Create a subdirectory to contain the libtest helper library. Define two variables to clarify when tests are aimed at public or internal components. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- test/meson.build | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'test/meson.build') diff --git a/test/meson.build b/test/meson.build index 6233d2c0..aabe79dd 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,17 +1,24 @@ -libtest_sources = files([ - 'test.cpp', -]) +subdir('libtest') -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, +] test_init = executable('test_init', 'init.cpp', - link_with : libcamera, - include_directories : libcamera_includes) + link_with : test_libraries, + include_directories : test_includes_public) list = executable('list', 'list.cpp', - link_with : [libcamera, libtest], - include_directories : libcamera_includes) + link_with : test_libraries, + include_directories : test_includes_public) subdir('media_device') -- cgit v1.2.1