summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/meson.build14
-rw-r--r--include/meson.build2
2 files changed, 7 insertions, 9 deletions
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 5b25ef84..567782a6 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: CC0-1.0
+libcamera_include_dir = 'libcamera' / 'libcamera'
+
libcamera_public_headers = files([
'camera.h',
'camera_manager.h',
@@ -16,14 +18,12 @@ libcamera_public_headers = files([
'transform.h',
])
-include_dir = libcamera_include_dir / 'libcamera'
-
subdir('base')
subdir('internal')
subdir('ipa')
install_headers(libcamera_public_headers,
- subdir : include_dir)
+ subdir : libcamera_include_dir)
#
# Generate headers from templates.
@@ -44,7 +44,7 @@ foreach header : control_source_files
output : header + '.h',
command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
install : true,
- install_dir : get_option('includedir') / include_dir)
+ install_dir : get_option('includedir') / libcamera_include_dir)
endforeach
libcamera_public_headers += control_headers
@@ -59,7 +59,7 @@ formats_h = custom_target('formats_h',
output : 'formats.h',
command : [gen_formats, '-o', '@OUTPUT@', '@INPUT@'],
install : true,
- install_dir : get_option('includedir') / include_dir)
+ install_dir : get_option('includedir') / libcamera_include_dir)
libcamera_public_headers += formats_h
# libcamera.h
@@ -68,7 +68,7 @@ libcamera_h = custom_target('gen-header',
output : 'libcamera.h',
command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],
install : true,
- install_dir : get_option('includedir') / include_dir)
+ install_dir : get_option('includedir') / libcamera_include_dir)
libcamera_public_headers += libcamera_h
@@ -82,4 +82,4 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2])
configure_file(input : 'version.h.in',
output : 'version.h',
configuration : libcamera_version_config,
- install_dir : get_option('includedir') / include_dir)
+ install_dir : get_option('includedir') / libcamera_include_dir)
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')