From patchwork Sat Mar 7 21:13:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3043 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D86296193A for ; Sat, 7 Mar 2020 22:13:38 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 76B3D24B for ; Sat, 7 Mar 2020 22:13:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583615618; bh=VHFt6gdl5DjmGLg+inD5RHBYmsujb2i8hC2EO4YPxKs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=NPXgoNVKK+JyGJDzQ44tvVD7c7M5nJFAhUcPISX9gok0zdfccN55Jmc+vsIBKk3Xs 7A+Elf2iiWs8x4GBEs7ROD214MEGpejfaOExSZWcSHr3xEiJSIv1nLCdBw8PWg2yoM EDXv05ZWH4/BEAJPXJIM/cvNfXqMCwbdSvIOjZpc= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 7 Mar 2020 23:13:22 +0200 Message-Id: <20200307211326.26994-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200307211326.26994-1-laurent.pinchart@ideasonboard.com> References: <20200307211326.26994-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/7] include: libcamera: meson: Add libcamera.h to the libcamera_api array 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: , X-List-Received-Date: Sat, 07 Mar 2020 21:13:39 -0000 The libcamera_api array is meant to contain all the headers from the libcamera public API, for the purpose of generating documentation and creating the libcamera_dep dependency. libcamera.h is part of the libcamera public API, add it to the array. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/meson.build | 2 ++ src/libcamera/meson.build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 88edf620f69e..23c01d3837ba 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -55,6 +55,8 @@ libcamera_h = custom_target('gen-header', install : true, install_dir : join_paths('include', include_dir)) +libcamera_api += libcamera_h + version = libcamera_version.split('.') libcamera_version_config = configuration_data() libcamera_version_config.set('LIBCAMERA_VERSION_MAJOR', version[0]) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 88658ac563f7..1b69bc0dee54 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -120,7 +120,7 @@ libcamera = shared_library('camera', build_rpath : '/', dependencies : libcamera_deps) -libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h], +libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api], include_directories : libcamera_includes, link_with : libcamera)