From patchwork Tue Jun 11 12:42:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 20254 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id F14BFC31E9 for ; Tue, 11 Jun 2024 12:42:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C01B065456; Tue, 11 Jun 2024 14:42:25 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="t9M+mzCx"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2AB6961A26 for ; Tue, 11 Jun 2024 14:42:25 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 68C557E0 for ; Tue, 11 Jun 2024 14:42:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1718109732; bh=WDlprtkHR7r8yy0SLjLAzG8e1x/IUerzty+aHYeiITk=; h=From:To:Subject:Date:From; b=t9M+mzCxvwQwsRb+ycSw3jm/3MG7J58hrvg2bt2aFO0T8mYAMXRbMUBuyWAWidsE2 VPu/oW2ib1Dv1ex9z5DIXT9zgO2NIow8pyPNYNbCvQgBGk9oLd4+LcbHYpf7nDh4SH 1GZR9Q8cvHHbJV0OHFnI05DS190A/KcOma/Ux9Dg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH] meson: Group libipa and libipa_includes in a dependency object Date: Tue, 11 Jun 2024 15:42:05 +0300 Message-ID: <20240611124205.18093-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.44.2 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Many build targets link with libipa and need libipa_includes. Group them in a libipa_dep dependency object to simplify the users. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder --- src/ipa/ipu3/meson.build | 5 ++--- src/ipa/libipa/meson.build | 4 ++++ src/ipa/rkisp1/meson.build | 5 ++--- src/ipa/rpi/vc4/meson.build | 4 +--- src/ipa/simple/meson.build | 5 ++--- src/ipa/vimc/meson.build | 5 ++--- test/ipa/meson.build | 6 +++--- test/ipa/rkisp1/meson.build | 6 +++--- 8 files changed, 19 insertions(+), 21 deletions(-) base-commit: f3caea0ff7e63b529c9464f911162aa457e9b858 diff --git a/src/ipa/ipu3/meson.build b/src/ipa/ipu3/meson.build index 66c398432d43..e76f97c07c87 100644 --- a/src/ipa/ipu3/meson.build +++ b/src/ipa/ipu3/meson.build @@ -15,9 +15,8 @@ ipu3_ipa_sources += ipu3_ipa_algorithms mod = shared_module(ipa_name, [ipu3_ipa_sources, libcamera_generated_ipa_headers], name_prefix : '', - include_directories : [ipa_includes, libipa_includes], - dependencies : libcamera_private, - link_with : libipa, + include_directories : [ipa_includes], + dependencies : [libcamera_private, libipa_dep], install : true, install_dir : ipa_install_dir) diff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build index 8ec9c7847348..7f038c90cd87 100644 --- a/src/ipa/libipa/meson.build +++ b/src/ipa/libipa/meson.build @@ -27,3 +27,7 @@ libipa_includes = include_directories('..') libipa = static_library('ipa', [libipa_sources, libipa_headers], include_directories : ipa_includes, dependencies : libcamera_private) + +libipa_dep = declare_dependency(sources : libipa_headers, + include_directories : libipa_includes, + link_with : libipa) diff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build index cf05cdb27943..e8b266f1ccca 100644 --- a/src/ipa/rkisp1/meson.build +++ b/src/ipa/rkisp1/meson.build @@ -16,9 +16,8 @@ rkisp1_ipa_sources += rkisp1_ipa_algorithms mod = shared_module(ipa_name, [rkisp1_ipa_sources, libcamera_generated_ipa_headers], name_prefix : '', - include_directories : [ipa_includes, libipa_includes], - dependencies : libcamera_private, - link_with : libipa, + include_directories : [ipa_includes], + dependencies : [libcamera_private, libipa_dep], install : true, install_dir : ipa_install_dir) diff --git a/src/ipa/rpi/vc4/meson.build b/src/ipa/rpi/vc4/meson.build index 590e9197756d..63fc5925b06c 100644 --- a/src/ipa/rpi/vc4/meson.build +++ b/src/ipa/rpi/vc4/meson.build @@ -15,7 +15,6 @@ vc4_ipa_libs = [ vc4_ipa_includes = [ ipa_includes, - libipa_includes, ] vc4_ipa_sources = files([ @@ -28,8 +27,7 @@ mod = shared_module(ipa_name, [vc4_ipa_sources, libcamera_generated_ipa_headers], name_prefix : '', include_directories : vc4_ipa_includes, - dependencies : vc4_ipa_deps, - link_with : libipa, + dependencies : [vc4_ipa_deps, libipa_dep], link_whole : vc4_ipa_libs, install : true, install_dir : ipa_install_dir) diff --git a/src/ipa/simple/meson.build b/src/ipa/simple/meson.build index 44b5f1d70cd3..33d1c96aa4f2 100644 --- a/src/ipa/simple/meson.build +++ b/src/ipa/simple/meson.build @@ -10,9 +10,8 @@ soft_simple_sources = files([ mod = shared_module(ipa_name, [soft_simple_sources, libcamera_generated_ipa_headers], name_prefix : '', - include_directories : [ipa_includes, libipa_includes], - dependencies : libcamera_private, - link_with : libipa, + include_directories : [ipa_includes], + dependencies : [libcamera_private, libipa_dep], install : true, install_dir : ipa_install_dir) diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build index 264a2d9a8964..d0b63eddd5f6 100644 --- a/src/ipa/vimc/meson.build +++ b/src/ipa/vimc/meson.build @@ -5,9 +5,8 @@ ipa_name = 'ipa_vimc' mod = shared_module(ipa_name, ['vimc.cpp', libcamera_generated_ipa_headers], name_prefix : '', - include_directories : [ipa_includes, libipa_includes], - dependencies : libcamera_private, - link_with : libipa, + include_directories : [ipa_includes], + dependencies : [libcamera_private, libipa_dep], install : true, install_dir : ipa_install_dir) diff --git a/test/ipa/meson.build b/test/ipa/meson.build index dc956284c4b1..fe21ca58b64f 100644 --- a/test/ipa/meson.build +++ b/test/ipa/meson.build @@ -9,9 +9,9 @@ ipa_test = [ foreach test : ipa_test exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers, - dependencies : libcamera_private, - link_with : [libipa, test_libraries], - include_directories : [libipa_includes, test_includes_internal]) + dependencies : [libcamera_private, libipa_dep], + link_with : [test_libraries], + include_directories : [test_includes_internal]) test(test['name'], exe, suite : 'ipa') endforeach diff --git a/test/ipa/rkisp1/meson.build b/test/ipa/rkisp1/meson.build index 5ffc5dd607b6..5b08e2939ce6 100644 --- a/test/ipa/rkisp1/meson.build +++ b/test/ipa/rkisp1/meson.build @@ -6,9 +6,9 @@ rkisp1_ipa_test = [ foreach test : rkisp1_ipa_test exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers, - dependencies : libcamera_private, - link_with : [libipa, test_libraries], - include_directories : [libipa_includes, test_includes_internal, + dependencies : [libcamera_private, libipa_dep], + link_with : [test_libraries], + include_directories : [test_includes_internal, '../../../src/ipa/rkisp1/']) test(test['name'], exe, suite : 'ipa')