From patchwork Mon Nov 26 14:01:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B307F60004 for ; Mon, 26 Nov 2018 15:01:17 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3701AE00; Mon, 26 Nov 2018 15:01:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1543240877; bh=QWwelBs69pNpLCCMom0eugYV5gMlx5aEuyAl1UfzsW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G7ieeMugaQB+O2tvj84+UK1x47hvLUdTZqDPMcvyApPnwmwvIjaV8Nmm/kZvyubQW 8ksZRn3C7UMefcE2NdNr3Ed00sdiixVRpF4e3knfR4zWBAf9DCAwHb4ubZVFM50ciA 2Lu3TID6JfTPZQjSXpOGp61gswnrqmy/1L2p0MTo= From: Kieran Bingham To: LibCamera Devel Date: Mon, 26 Nov 2018 14:01:10 +0000 Message-Id: <20181126140111.13255-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181126140111.13255-1-kieran.bingham@ideasonboard.com> References: <20181126140111.13255-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 1/2] lib: Include library in the install target 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: Mon, 26 Nov 2018 14:01:17 -0000 The shared library build target does not install the library when 'ninja install' is executed. Flag it as an installable item. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- lib/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/meson.build b/lib/meson.build index 37876cee48ff..eee99b7525ce 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -2,4 +2,5 @@ sources = ['main.cpp'] libcamera = shared_library('camera', sources, + install : true, include_directories : inc) From patchwork Mon Nov 26 14:01:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 16 Return-Path: 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 E813B60004 for ; Mon, 26 Nov 2018 15:01:17 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 85B0AE03; Mon, 26 Nov 2018 15:01:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1543240877; bh=2gJC/fUWG5LzX6IkaMFZgi/SgKqb0s+9TEB+JqVeZzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PHQHD9oyVXBk+1urqQvMr1dlgcC6dzeiqwo2nzIeFPgK+Iaa1x9O04uyc1jtFyMjA PDfBKlYxK8ypasMPwbWaj8av9d4qXLx6EconeJOM06dE8q4rVJuIFylobTbE+CMQeB moGTdIy1UbogIZ+2jxG6z7kt5wCqSbODXoY8DUyo= From: Kieran Bingham To: LibCamera Devel Date: Mon, 26 Nov 2018 14:01:11 +0000 Message-Id: <20181126140111.13255-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181126140111.13255-1-kieran.bingham@ideasonboard.com> References: <20181126140111.13255-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] include: Install include files 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: Mon, 26 Nov 2018 14:01:18 -0000 The include directory was defined but not installed. Add it to the meson build structure to incorporate it as part of the library install. To facilitate the same include paths in our internal includes, update the structure for headers to match the install structure. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- DESTDIR=/tmp/install/libcamera ninja install /tmp/install/libcamera/ └── usr └── local ├── include │   └── libcamera │   └── libcamera.h ├── lib │   └── x86_64-linux-gnu │   ├── libcamera.so │   └── pkgconfig │   └── camera.pc └── share └── doc └── libcamera-0.1 └── html include/{ => libcamera}/libcamera.h | 0 include/libcamera/meson.build | 6 ++++++ include/meson.build | 1 + meson.build | 1 + test/init.cpp | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) rename include/{ => libcamera}/libcamera.h (100%) create mode 100644 include/libcamera/meson.build create mode 100644 include/meson.build diff --git a/include/libcamera.h b/include/libcamera/libcamera.h similarity index 100% rename from include/libcamera.h rename to include/libcamera/libcamera.h diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build new file mode 100644 index 000000000000..d30356af112a --- /dev/null +++ b/include/libcamera/meson.build @@ -0,0 +1,6 @@ +public_api = [ + 'libcamera.h', +] + +install_headers(public_api, + subdir : 'libcamera') diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 000000000000..4ce9668caa7b --- /dev/null +++ b/include/meson.build @@ -0,0 +1 @@ +subdir('libcamera') diff --git a/meson.build b/meson.build index 434aa557b8a1..494193483079 100644 --- a/meson.build +++ b/meson.build @@ -10,6 +10,7 @@ api_version = '0.1' inc = include_directories('include') subdir('Documentation') +subdir('include') subdir('lib') subdir('test') subdir('utils') diff --git a/test/init.cpp b/test/init.cpp index 182728d349a3..8c8ec9adfb83 100644 --- a/test/init.cpp +++ b/test/init.cpp @@ -1,4 +1,4 @@ -#include +#include int main(void) {