[libcamera-devel] [PATCH 3/5] test: Move include definitions to libtest

Kieran Bingham kieran.bingham at ideasonboard.com
Tue Jan 1 22:29:45 CET 2019


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 <kieran.bingham at ideasonboard.com>
---
 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 = [
-- 
2.17.1



More information about the libcamera-devel mailing list