diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-12-04 23:38:48 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-12-06 16:34:01 +0200 |
| commit | 913b3ee817a34bd78d5a8dc4fc9025920202db09 (patch) | |
| tree | f8d4bde59d0df93d2e8002dd38b35fe1e8199e38 | |
| parent | 0713202dc00df8aa4d2101d923546bff18d51921 (diff) | |
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>
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/libcamera/include/.keep_empty | 0 | ||||
| -rw-r--r-- | src/libcamera/main.cpp (renamed from lib/main.cpp) | 0 | ||||
| -rw-r--r-- | src/libcamera/meson.build (renamed from lib/meson.build) | 7 | ||||
| -rw-r--r-- | src/meson.build | 1 | ||||
| -rw-r--r-- | test/meson.build | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/meson.build b/meson.build index e0aeefa3..e6ed03f9 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/src/libcamera/include/.keep_empty b/src/libcamera/include/.keep_empty new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/libcamera/include/.keep_empty diff --git a/lib/main.cpp b/src/libcamera/main.cpp index 0059e0c9..0059e0c9 100644 --- a/lib/main.cpp +++ b/src/libcamera/main.cpp diff --git a/lib/meson.build b/src/libcamera/meson.build index fcd738cc..07d9cd44 100644 --- a/lib/meson.build +++ b/src/libcamera/meson.build @@ -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) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 00000000..4ce9668c --- /dev/null +++ b/src/meson.build @@ -0,0 +1 @@ +subdir('libcamera') diff --git a/test/meson.build b/test/meson.build index afe9bd9a..924a26f1 100644 --- a/test/meson.build +++ b/test/meson.build @@ -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) |