diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2018-11-26 10:32:13 +0000 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2018-11-27 12:10:57 +0000 |
| commit | 66051636c5754a33a812d9f306935e29397e0009 (patch) | |
| tree | a93234cc52cf3e53c0ba9d6691553aac14ad0fde | |
| parent | 88c35c90847c9cdd7d0cbee80f45ed32f1811189 (diff) | |
include: Install include files
The include directory was defined but not installed.
Add it to the meson build structure to incorporate it as part of the
library install.
To facilitate the same include paths in our internal includes, update
the structure for headers to match the install structure.
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | include/libcamera/libcamera.h (renamed from include/libcamera.h) | 0 | ||||
| -rw-r--r-- | include/libcamera/meson.build | 6 | ||||
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | test/init.cpp | 2 |
5 files changed, 9 insertions, 1 deletions
diff --git a/include/libcamera.h b/include/libcamera/libcamera.h index d5b34a2c..d5b34a2c 100644 --- a/include/libcamera.h +++ b/include/libcamera/libcamera.h diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build new file mode 100644 index 00000000..da685f34 --- /dev/null +++ b/include/libcamera/meson.build @@ -0,0 +1,6 @@ +public_api = [ + 'libcamera.h', +] + +install_headers(public_api, + subdir : 'libcamera') diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 00000000..4ce9668c --- /dev/null +++ b/include/meson.build @@ -0,0 +1 @@ +subdir('libcamera') diff --git a/meson.build b/meson.build index 4b3d528c..1f57b49d 100644 --- a/meson.build +++ b/meson.build @@ -4,6 +4,7 @@ project('libcamera - supporting complex camera pipelines', 'c', 'cpp', inc = include_directories('include') +subdir('include') subdir('lib') subdir('test') subdir('utils') diff --git a/test/init.cpp b/test/init.cpp index 182728d3..8c8ec9ad 100644 --- a/test/init.cpp +++ b/test/init.cpp @@ -1,4 +1,4 @@ -#include <libcamera.h> +#include <libcamera/libcamera.h> int main(void) { |