diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-05-15 19:01:30 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-05-16 03:38:47 +0300 |
commit | f934fd1cb9371dc49e32aee061284a2dadd8ea89 (patch) | |
tree | f5d48eb40eff616cf206ca66191b6b8a9984c48c /src/libcamera/proxy | |
parent | 93e72b695e477ac1efc22a0bdddb177199cf2fb9 (diff) |
libcamera: Move IPA headers from include/ipa/ to include/libcamera/ipa/
The IPA headers are installed into $prefix/include/libcamera/ipa/, but
are located in the source tree in include/ipa/. This requires files
within libcamera to include them with
#include <ipa/foo.h>
while a third party IPA would need to use
#include <libcamera/ipa/foo.h>
Not only is this inconsistent, it can create issues later if IPA headers
need to include each other, as the first form of include directive
wouldn't be valid once the headers are installed.
Fix the problem by moving the IPA headers to include/libcamera/ipa/.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/proxy')
-rw-r--r-- | src/libcamera/proxy/ipa_proxy_linux.cpp | 4 | ||||
-rw-r--r-- | src/libcamera/proxy/ipa_proxy_thread.cpp | 4 | ||||
-rw-r--r-- | src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp index 7d6f8799..be34f20a 100644 --- a/src/libcamera/proxy/ipa_proxy_linux.cpp +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp @@ -7,8 +7,8 @@ #include <vector> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipa_proxy.h" diff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp index 03d4c0d9..6fbebed2 100644 --- a/src/libcamera/proxy/ipa_proxy_thread.cpp +++ b/src/libcamera/proxy/ipa_proxy_thread.cpp @@ -7,8 +7,8 @@ #include <memory> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/ipa_context_wrapper.h" #include "libcamera/internal/ipa_module.h" diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp index 9ba94d01..0c4687f7 100644 --- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp +++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp @@ -9,8 +9,8 @@ #include <sys/types.h> #include <unistd.h> -#include <ipa/ipa_interface.h> #include <libcamera/event_dispatcher.h> +#include <libcamera/ipa/ipa_interface.h> #include <libcamera/logging.h> #include "libcamera/internal/ipa_module.h" |