From ff6c50974a2059649f4c96a96d41a50d7eb7a780 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 26 Sep 2021 18:59:27 +0300 Subject: 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 `. 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 Bug: https://bugs.libcamera.org/show_bug.cgi?id=79 Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- include/meson.build | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/meson.build') 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') -- cgit v1.2.1