diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-09-26 18:59:27 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-09-28 20:09:39 +0300 |
| commit | ff6c50974a2059649f4c96a96d41a50d7eb7a780 (patch) | |
| tree | 564dfd36aaa7141601355af121fd14ac0a5a272f /include/meson.build | |
| parent | e00149fccb0a16b445359c8037a6f4cfd484a10f (diff) | |
libcamera: Fix base and ipa include dir
All libcamera headers are meant to be installed in
${prefix}/include/libcamera/libcamera, with pkgconfig specifying the
include directory as `-I ${prefix}/include/libcamera`. Applications then
include the headers with `#include <libcamera/camera.h>`.
The base and ipa headers are meant to be installed in subdirectories of
the libcamera headers directory, but are mistakenly installed one level
too high, in ${prefix}/include/libcamera. This leads to compilation
failures when including the base or ipa header.
Fix this by setting the meson libcamera_include_dir variable to the
libcamera headers directory. All other header paths are derived from
that variable and are now correct.
Reported-by: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Bug: https://bugs.libcamera.org/show_bug.cgi?id=79
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include/meson.build')
| -rw-r--r-- | include/meson.build | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/meson.build b/include/meson.build index 2ac9a3a0..27ce2f41 100644 --- a/include/meson.build +++ b/include/meson.build @@ -1,6 +1,4 @@ # SPDX-License-Identifier: CC0-1.0 -libcamera_include_dir = 'libcamera' - subdir('android') subdir('libcamera') |