diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-05-23 00:14:19 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-05-23 13:56:33 +0300 |
| commit | 3fac104158fcbdd7d6d7ffb34e5db77f1f9ebeb5 (patch) | |
| tree | f7ac0853bb9a3105d36629a268fb95d32e11c47a /src | |
| parent | 41adc3f8d39e78eb432bf33ab859d1f5429b85dc (diff) | |
meson: Create and use a dependency for libcamera and its headers
Instead of manually adding the libcamera library and include path to
every target that requires it, declare a dependency that groups the
headers as source, the library and the include path, and use it through
the project. This simplifies handling of the dependency.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cam/meson.build | 5 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 4 | ||||
| -rw-r--r-- | src/qcam/meson.build | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/cam/meson.build b/src/cam/meson.build index 85129509..3faddc6c 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -6,6 +6,5 @@ cam_sources = files([ ]) cam = executable('cam', cam_sources, - link_with : libcamera, - install : true, - include_directories : libcamera_includes) + dependencies : libcamera_dep, + install : true) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 8294ed35..0ebb25bc 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -65,3 +65,7 @@ libcamera = shared_library('camera', install : true, include_directories : includes, dependencies : libudev) + +libcamera_dep = declare_dependency(sources : libcamera_api, + include_directories : libcamera_includes, + link_with : libcamera) diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 56b57a26..9f1fa75f 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -15,9 +15,7 @@ qt5_dep = dependency('qt5', if qt5_dep.found() qcam = executable('qcam', qcam_sources, - link_with : libcamera, install : true, - include_directories : libcamera_includes, - dependencies : qt5_dep, + dependencies : [libcamera_dep, qt5_dep], cpp_args : '-DQT_NO_KEYWORDS') endif |