From a25533089bda04daf0243eda7e316baea0737e19 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 25 Mar 2020 09:36:35 +0200 Subject: ipa: Move vimc to a subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Give a subdirectory to all IPA modules 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 Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/ipa/meson.build | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/ipa/meson.build') diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 42180324..9aaf9249 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') -- cgit v1.2.1