From patchwork Wed Jul 3 08:00:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1595 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1D9E361570 for ; Wed, 3 Jul 2019 10:00:37 +0200 (CEST) Received: from neptunite.flets-east.jp (p1871204-ipngn14001hodogaya.kanagawa.ocn.ne.jp [153.220.127.204]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A6C1D24B; Wed, 3 Jul 2019 10:00:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1562140836; bh=/s3QCv5nJ2MJzAerFkSVbuaBQNVBbcdKR6KgFkXIzRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ryw85PqL1SS3mlvQY/PMXYLLU+jsz4UOzYCMrEcNEQuc0Bqni2o7i0SLBbxPbKCg0 0ePP0kBzPuAG4f2S8CFGkna+8PuN2kuczz6cGmqho589B1UMcgElfSoCvhZ+AsEeWc 0BpnD1iZco8OBLzCd+un1XQfpmIogCSFV5boAVs4= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Wed, 3 Jul 2019 17:00:07 +0900 Message-Id: <20190703080007.21376-8-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703080007.21376-1-paul.elder@ideasonboard.com> References: <20190703080007.21376-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 7/7] libcamera: ipa: meson: build dummy IPA that needs isolation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2019 08:00:37 -0000 Add the dummy IPA that needs isolation to meson. At the same time, clean up the IPA meson to facilitate adding more IPAs. Signed-off-by: Paul Elder --- Changes in v2: - make a sub install directory for IPAs, to keep them separate from the proxies - remove shim compilation src/ipa/meson.build | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 3c33a37..1558002 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -1,15 +1,18 @@ -ipa_dummy_sources = files([ - 'ipa_dummy.cpp', -]) +ipa_dummy_sources = [ + ['ipa_dummy', 'ipa_dummy.cpp'], + ['ipa_dummy_isolate', 'ipa_dummy_isolate.cpp'], +] -ipa_install_dir = join_paths(get_option('libdir'), 'libcamera') +ipa_install_dir = join_paths(get_option('libdir'), 'libcamera', 'ipa') -ipa_dummy = shared_library('ipa_dummy', - ipa_dummy_sources, - name_prefix : '', - include_directories : libcamera_includes, - install : true, - install_dir : ipa_install_dir) +foreach t : ipa_dummy_sources + ipa = shared_module(t[0], + t[1], + name_prefix : '', + include_directories : libcamera_includes, + install : true, + install_dir : ipa_install_dir) +endforeach config_h.set('IPA_MODULE_DIR', '"' + join_paths(get_option('prefix'), ipa_install_dir) + '"')