From b403cb4550628acd0f1835354558cd5a5b131edf Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 1 Jan 2019 21:13:44 +0000 Subject: test: Move include definitions to libtest With the libtest functionality moved to its own library folder, the definitions for test includes 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 Signed-off-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 b998154d..e0893b70 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 ae8b3fb9..184a7eeb 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 = [ -- cgit v1.2.1