Overhaul the directory structure
In order to match the directory structure of traditional projects, rename the top-level lib/ directory to src/libcamera/. Other libraries developed as part of the project will later find a home in src/. Split the libcamera header files in three categories: public headers describing the public API in include/libcamera/, internal headers describing the internal API in src/libcamera/include/, and private headers local to one or a small number of compilation units along the corresponding .cpp files. As no internal header exists yet the src/libcamera/include/ directory is created empty as the build system would fail otherwise. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
0713202dc0
commit
913b3ee817
6 changed files with 10 additions and 4 deletions
|
@ -21,11 +21,11 @@ cpp_arguments = common_arguments
|
|||
add_project_arguments(c_arguments, language: 'c')
|
||||
add_project_arguments(cpp_arguments, language: 'cpp')
|
||||
|
||||
inc = include_directories('include')
|
||||
libcamera_includes = include_directories('include')
|
||||
|
||||
subdir('Documentation')
|
||||
subdir('include')
|
||||
subdir('lib')
|
||||
subdir('src')
|
||||
subdir('test')
|
||||
subdir('utils')
|
||||
|
||||
|
|
0
src/libcamera/include/.keep_empty
Normal file
0
src/libcamera/include/.keep_empty
Normal file
|
@ -1,6 +1,11 @@
|
|||
sources = ['main.cpp']
|
||||
|
||||
includes = [
|
||||
libcamera_includes,
|
||||
include_directories('include'),
|
||||
]
|
||||
|
||||
libcamera = shared_library('camera',
|
||||
sources,
|
||||
install : true,
|
||||
include_directories : inc)
|
||||
include_directories : includes)
|
1
src/meson.build
Normal file
1
src/meson.build
Normal file
|
@ -0,0 +1 @@
|
|||
subdir('libcamera')
|
|
@ -1,5 +1,5 @@
|
|||
test_init = executable('test_init', 'init.cpp',
|
||||
link_with : libcamera,
|
||||
include_directories : inc)
|
||||
include_directories : libcamera_includes)
|
||||
|
||||
test('Initialisation test', test_init)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue