[libcamera-devel] [PATCH 15/16] libcamera: rename public libcamera dependency
Kieran Bingham
kieran.bingham at ideasonboard.com
Fri Jun 25 03:35:38 CEST 2021
Now that we have a libcamera_private, make the public only dependency
libcamera_public so that it is clear which interface is being linked.
Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---
src/cam/meson.build | 2 +-
src/gstreamer/meson.build | 2 +-
src/lc-compliance/meson.build | 2 +-
src/libcamera/meson.build | 16 ++++++++--------
src/qcam/meson.build | 2 +-
test/controls/meson.build | 2 +-
test/meson.build | 2 +-
test/stream/meson.build | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/cam/meson.build b/src/cam/meson.build
index 5e1a7f387d60..6234ed0a059a 100644
--- a/src/cam/meson.build
+++ b/src/cam/meson.build
@@ -21,7 +21,7 @@ cam_sources = files([
cam = executable('cam', cam_sources,
dependencies : [
libatomic,
- libcamera_dep,
+ libcamera_public,
libevent,
],
install : true)
diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build
index 4d3afee48737..77c79140eb37 100644
--- a/src/gstreamer/meson.build
+++ b/src/gstreamer/meson.build
@@ -42,7 +42,7 @@ endif
libcamera_gst = shared_library('gstlibcamera',
libcamera_gst_sources,
cpp_args : libcamera_gst_cpp_args,
- dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep],
+ dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep],
install: true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
)
diff --git a/src/lc-compliance/meson.build b/src/lc-compliance/meson.build
index a2bfcceb1259..f3a7cbdec4f8 100644
--- a/src/lc-compliance/meson.build
+++ b/src/lc-compliance/meson.build
@@ -21,7 +21,7 @@ lc_compliance_sources = files([
lc_compliance = executable('lc-compliance', lc_compliance_sources,
dependencies : [
libatomic,
- libcamera_dep,
+ libcamera_public,
libevent,
],
install : true)
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 706f44924f65..40af7adbf05f 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -131,20 +131,20 @@ libcamera = shared_library('libcamera',
build_rpath : '/',
dependencies : libcamera_deps)
-libcamera_dep = declare_dependency(sources : [
- libcamera_ipa_headers,
- libcamera_public_headers,
- ],
- include_directories : libcamera_includes,
- dependencies : libcamera_base,
- link_with : libcamera)
+libcamera_public = declare_dependency(sources : [
+ libcamera_ipa_headers,
+ libcamera_public_headers,
+ ],
+ include_directories : libcamera_includes,
+ dependencies : libcamera_base,
+ link_with : libcamera)
# Internal dependancy for components and plugins which can use Private APIs
libcamera_private = declare_dependency(sources : [
libcamera_generated_ipa_headers,
],
dependencies : [
- libcamera_dep,
+ libcamera_public,
libcamera_base_private,
])
diff --git a/src/qcam/meson.build b/src/qcam/meson.build
index fad4cc95ddf7..7d3621c93d41 100644
--- a/src/qcam/meson.build
+++ b/src/qcam/meson.build
@@ -35,7 +35,7 @@ qcam_resources = files([
qcam_deps = [
libatomic,
- libcamera_dep,
+ libcamera_public,
qt5_dep,
]
diff --git a/test/controls/meson.build b/test/controls/meson.build
index 188c96da3336..0103543e1fc2 100644
--- a/test/controls/meson.build
+++ b/test/controls/meson.build
@@ -9,7 +9,7 @@ control_tests = [
foreach t : control_tests
exe = executable(t[0], t[1],
- dependencies : libcamera_dep,
+ dependencies : libcamera_public,
link_with : test_libraries,
include_directories : test_includes_internal)
test(t[0], exe, suite : 'controls', is_parallel : false)
diff --git a/test/meson.build b/test/meson.build
index b8615e0fd3e6..73eb44d03ad0 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -55,7 +55,7 @@ internal_tests = [
foreach t : public_tests
exe = executable(t[0], t[1],
- dependencies : libcamera_dep,
+ dependencies : libcamera_public,
link_with : test_libraries,
include_directories : test_includes_public)
diff --git a/test/stream/meson.build b/test/stream/meson.build
index 5d3ef5881b44..73608ffdff7f 100644
--- a/test/stream/meson.build
+++ b/test/stream/meson.build
@@ -6,7 +6,7 @@ stream_tests = [
foreach t : stream_tests
exe = executable(t[0], t[1],
- dependencies : libcamera_dep,
+ dependencies : libcamera_public,
link_with : test_libraries,
include_directories : test_includes_internal)
test(t[0], exe, suite: 'stream')
--
2.30.2
More information about the libcamera-devel
mailing list