diff options
| -rw-r--r-- | src/cam/meson.build | 2 | ||||
| -rw-r--r-- | src/gstreamer/meson.build | 2 | ||||
| -rw-r--r-- | src/lc-compliance/meson.build | 2 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 16 | ||||
| -rw-r--r-- | src/qcam/meson.build | 2 | ||||
| -rw-r--r-- | test/controls/meson.build | 2 | ||||
| -rw-r--r-- | test/meson.build | 2 | ||||
| -rw-r--r-- | 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 5e1a7f38..6234ed0a 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 4d3afee4..77c79140 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 a2bfcceb..f3a7cbde 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 d6905576..517e763d 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -132,20 +132,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 dependency 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 fad4cc95..7d3621c9 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 188c96da..0103543e 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 b8615e0f..73eb44d0 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 5d3ef588..73608ffd 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') |