| Message ID | 20200325085805.11749-3-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | a25533089bda04daf0243eda7e316baea0737e19 |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, On 25/03/2020 08:58, Laurent Pinchart wrote: > Give a subdirectory to all IPA moduels to make the structure of the /moduels/modules/ > source tree more consistent. This will also simplify the implementation > of IPA module selection at build time. > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > src/ipa/meson.build | 20 ++------------------ > src/ipa/vimc/meson.build | 15 +++++++++++++++ > src/ipa/{ipa_vimc.cpp => vimc/vimc.cpp} | 2 +- > 3 files changed, 18 insertions(+), 19 deletions(-) > create mode 100644 src/ipa/vimc/meson.build > rename src/ipa/{ipa_vimc.cpp => vimc/vimc.cpp} (98%) > > diff --git a/src/ipa/meson.build b/src/ipa/meson.build > index 421803243e32..9aaf92494d37 100644 > --- a/src/ipa/meson.build > +++ b/src/ipa/meson.build > @@ -1,8 +1,3 @@ > -ipa_vimc_sources = [ > - ['ipa_vimc', 'LGPL-2.1-or-later'], > - ['ipa_vimc_isolate', 'Proprietary'], > -] > - > ipa_install_dir = join_paths(get_option('libdir'), 'libcamera') > > ipa_includes = [ > @@ -10,20 +5,9 @@ ipa_includes = [ > libcamera_internal_includes, > ] > > -subdir('libipa') > - > -foreach t : ipa_vimc_sources > - ipa = shared_module(t[0], 'ipa_vimc.cpp', > - name_prefix : '', > - include_directories : ipa_includes, > - dependencies : libcamera_dep, > - link_with : libipa, > - install : true, > - install_dir : ipa_install_dir, > - cpp_args : '-DLICENSE="' + t[1] + '"') > -endforeach > - Ugh - so Vimc shoudl probably already have had it's own directory anyway :-) > config_h.set('IPA_MODULE_DIR', > '"' + join_paths(get_option('prefix'), ipa_install_dir) + '"') > > +subdir('libipa') > subdir('rkisp1') > +subdir('vimc') > diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build > new file mode 100644 > index 000000000000..435c7d3160be > --- /dev/null > +++ b/src/ipa/vimc/meson.build > @@ -0,0 +1,15 @@ > +ipa_vimc_sources = [ > + ['ipa_vimc', 'LGPL-2.1-or-later'], > + ['ipa_vimc_isolate', 'Proprietary'], > +] > + > +foreach t : ipa_vimc_sources > + ipa = shared_module(t[0], 'vimc.cpp', > + name_prefix : '', > + include_directories : [ipa_includes, libipa_includes], > + dependencies : libcamera_dep, > + link_with : libipa, > + install : true, > + install_dir : ipa_install_dir, > + cpp_args : '-DLICENSE="' + t[1] + '"') > +endforeach > diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/vimc/vimc.cpp > similarity index 98% > rename from src/ipa/ipa_vimc.cpp > rename to src/ipa/vimc/vimc.cpp > index 4751ad919a0f..6e2095b56bbc 100644 > --- a/src/ipa/ipa_vimc.cpp > +++ b/src/ipa/vimc/vimc.cpp > @@ -17,7 +17,7 @@ > #include <ipa/ipa_interface.h> > #include <ipa/ipa_module_info.h> > > -#include "libipa/ipa_interface_wrapper.h" > +#include <libipa/ipa_interface_wrapper.h> > > #include "log.h" > >
diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 421803243e32..9aaf92494d37 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -1,8 +1,3 @@ -ipa_vimc_sources = [ - ['ipa_vimc', 'LGPL-2.1-or-later'], - ['ipa_vimc_isolate', 'Proprietary'], -] - ipa_install_dir = join_paths(get_option('libdir'), 'libcamera') ipa_includes = [ @@ -10,20 +5,9 @@ ipa_includes = [ libcamera_internal_includes, ] -subdir('libipa') - -foreach t : ipa_vimc_sources - ipa = shared_module(t[0], 'ipa_vimc.cpp', - name_prefix : '', - include_directories : ipa_includes, - dependencies : libcamera_dep, - link_with : libipa, - install : true, - install_dir : ipa_install_dir, - cpp_args : '-DLICENSE="' + t[1] + '"') -endforeach - config_h.set('IPA_MODULE_DIR', '"' + join_paths(get_option('prefix'), ipa_install_dir) + '"') +subdir('libipa') subdir('rkisp1') +subdir('vimc') diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build new file mode 100644 index 000000000000..435c7d3160be --- /dev/null +++ b/src/ipa/vimc/meson.build @@ -0,0 +1,15 @@ +ipa_vimc_sources = [ + ['ipa_vimc', 'LGPL-2.1-or-later'], + ['ipa_vimc_isolate', 'Proprietary'], +] + +foreach t : ipa_vimc_sources + ipa = shared_module(t[0], 'vimc.cpp', + name_prefix : '', + include_directories : [ipa_includes, libipa_includes], + dependencies : libcamera_dep, + link_with : libipa, + install : true, + install_dir : ipa_install_dir, + cpp_args : '-DLICENSE="' + t[1] + '"') +endforeach diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/vimc/vimc.cpp similarity index 98% rename from src/ipa/ipa_vimc.cpp rename to src/ipa/vimc/vimc.cpp index 4751ad919a0f..6e2095b56bbc 100644 --- a/src/ipa/ipa_vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -17,7 +17,7 @@ #include <ipa/ipa_interface.h> #include <ipa/ipa_module_info.h> -#include "libipa/ipa_interface_wrapper.h" +#include <libipa/ipa_interface_wrapper.h> #include "log.h"
Give a subdirectory to all IPA moduels to make the structure of the source tree more consistent. This will also simplify the implementation of IPA module selection at build time. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/ipa/meson.build | 20 ++------------------ src/ipa/vimc/meson.build | 15 +++++++++++++++ src/ipa/{ipa_vimc.cpp => vimc/vimc.cpp} | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 src/ipa/vimc/meson.build rename src/ipa/{ipa_vimc.cpp => vimc/vimc.cpp} (98%)