summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libcamera/base/meson.build2
-rw-r--r--src/libcamera/meson.build1
-rw-r--r--test/meson.build23
3 files changed, 21 insertions, 5 deletions
diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build
index 3b9d74ef..7a75914a 100644
--- a/src/libcamera/base/meson.build
+++ b/src/libcamera/base/meson.build
@@ -38,9 +38,9 @@ if libunwind.found()
endif
libcamera_base_deps = [
- dependency('threads'),
libatomic,
libdw,
+ libthreads,
libunwind,
]
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 63b47b17..7fcbb2dd 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -58,6 +58,7 @@ includes = [
]
libatomic = cc.find_library('atomic', required : false)
+libthreads = dependency('threads')
subdir('base')
subdir('ipa')
diff --git a/test/meson.build b/test/meson.build
index 6cc77841..9bf7bf34 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -51,7 +51,7 @@ internal_tests = [
['pixel-format', 'pixel-format.cpp'],
['shared-fd', 'shared-fd.cpp'],
['signal-threads', 'signal-threads.cpp'],
- ['threads', 'threads.cpp'],
+ ['threads', 'threads.cpp', [libthreads]],
['timer', 'timer.cpp'],
['timer-thread', 'timer-thread.cpp'],
['unique-fd', 'unique-fd.cpp'],
@@ -65,8 +65,13 @@ internal_non_parallel_tests = [
]
foreach t : public_tests
+ deps = [libcamera_public]
+ if t.length() > 2
+ deps += t[2]
+ endif
+
exe = executable(t[0], t[1],
- dependencies : libcamera_public,
+ dependencies : deps,
link_with : test_libraries,
include_directories : test_includes_public)
@@ -74,8 +79,13 @@ foreach t : public_tests
endforeach
foreach t : internal_tests
+ deps = [libcamera_private]
+ if t.length() > 2
+ deps += t[2]
+ endif
+
exe = executable(t[0], t[1],
- dependencies : libcamera_private,
+ dependencies : deps,
link_with : test_libraries,
include_directories : test_includes_internal)
@@ -83,8 +93,13 @@ foreach t : internal_tests
endforeach
foreach t : internal_non_parallel_tests
+ deps = [libcamera_private]
+ if t.length() > 2
+ deps += t[2]
+ endif
+
exe = executable(t[0], t[1],
- dependencies : libcamera_private,
+ dependencies : deps,
link_with : test_libraries,
include_directories : test_includes_internal)