diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-08-14 03:33:57 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-08-16 14:53:25 +0300 |
commit | b954deff2071399ca941ffd719e762968f28feae (patch) | |
tree | 1e845095f3faec4834f3b1cdf5330846a6d26aa9 | |
parent | dfc6d711c9f7f0a9868afa5158aa2089163bded3 (diff) |
meson: Use dependency() instead of find_library() where possible
Usage of find_library() to find dependencies that libcamera needs to
compile against can lead to the library being found even if the
corresponding headers are not installed. This will then result in a
compilation failure. Switch to dependency() for libdw, libunwind and
lttng-ust to fix this, all three libraries come with a pkgconfig file
that is usually installed by the distribution package that contains the
library headers.
Reported-by: Christian Rauch <Rauch.Christian@gmx.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | src/libcamera/base/meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build index e8b81ad8..72919102 100644 --- a/meson.build +++ b/meson.build @@ -122,7 +122,7 @@ libcamera_includes = include_directories('include') py_modules = [] # Libraries used by multiple components -liblttng = cc.find_library('lttng-ust', required : get_option('tracing')) +liblttng = dependency('lttng-ust', required : get_option('tracing')) # Pipeline handlers # diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 7030ad1f..3b9d74ef 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -22,8 +22,8 @@ libcamera_base_sources = files([ 'utils.cpp', ]) -libdw = cc.find_library('libdw', required : false) -libunwind = cc.find_library('libunwind', required : false) +libdw = dependency('libdw', required : false) +libunwind = dependency('libunwind', required : false) if cc.has_header_symbol('execinfo.h', 'backtrace') config_h.set('HAVE_BACKTRACE', 1) |