{"id":16,"url":"https://patchwork.libcamera.org/api/1.1/patches/16/?format=json","web_url":"https://patchwork.libcamera.org/patch/16/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20181126140111.13255-3-kieran.bingham@ideasonboard.com>","date":"2018-11-26T14:01:11","name":"[libcamera-devel,2/2] include: Install include files","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bdfd8c431df1ccaa801fc2811c775805aa6c7604","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16/mbox/","series":[{"id":7,"url":"https://patchwork.libcamera.org/api/1.1/series/7/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=7","date":"2018-11-26T14:01:09","name":"library install targets","version":1,"mbox":"https://patchwork.libcamera.org/series/7/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E813B60004\n\tfor ;\n\tMon, 26 Nov 2018 15:01:17 +0100 (CET)","from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 85B0AE03;\n\tMon, 26 Nov 2018 15:01:17 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1543240877;\n\tbh=2gJC/fUWG5LzX6IkaMFZgi/SgKqb0s+9TEB+JqVeZzs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PHQHD9oyVXBk+1urqQvMr1dlgcC6dzeiqwo2nzIeFPgK+Iaa1x9O04uyc1jtFyMjA\n\tPDfBKlYxK8ypasMPwbWaj8av9d4qXLx6EconeJOM06dE8q4rVJuIFylobTbE+CMQeB\n\tmoGTdIy1UbogIZ+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","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 26 Nov 2018 14:01:18 -0000"},"content":"The include directory was defined but not installed.\n\nAdd it to the meson build structure to incorporate it as part of the\nlibrary install.\n\nTo facilitate the same include paths in our internal includes, update\nthe structure for headers to match the install structure.\n\nSigned-off-by: Kieran Bingham \n\n---\n\nDESTDIR=/tmp/install/libcamera ninja install\n\n/tmp/install/libcamera/\n└── usr\n └── local\n ├── include\n │   └── libcamera\n │   └── libcamera.h\n ├── lib\n │   └── x86_64-linux-gnu\n │   ├── libcamera.so\n │   └── pkgconfig\n │   └── camera.pc\n └── share\n └── doc\n └── libcamera-0.1\n └── html\n\n include/{ => libcamera}/libcamera.h | 0\n include/libcamera/meson.build | 6 ++++++\n include/meson.build | 1 +\n meson.build | 1 +\n test/init.cpp | 2 +-\n 5 files changed, 9 insertions(+), 1 deletion(-)\n rename include/{ => libcamera}/libcamera.h (100%)\n create mode 100644 include/libcamera/meson.build\n create mode 100644 include/meson.build","diff":"diff --git a/include/libcamera.h b/include/libcamera/libcamera.h\nsimilarity index 100%\nrename from include/libcamera.h\nrename to include/libcamera/libcamera.h\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nnew file mode 100644\nindex 000000000000..d30356af112a\n--- /dev/null\n+++ b/include/libcamera/meson.build\n@@ -0,0 +1,6 @@\n+public_api = [\n+\t'libcamera.h',\n+]\n+\n+install_headers(public_api,\n+\t\tsubdir : 'libcamera')\ndiff --git a/include/meson.build b/include/meson.build\nnew file mode 100644\nindex 000000000000..4ce9668caa7b\n--- /dev/null\n+++ b/include/meson.build\n@@ -0,0 +1 @@\n+subdir('libcamera')\ndiff --git a/meson.build b/meson.build\nindex 434aa557b8a1..494193483079 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -10,6 +10,7 @@ api_version = '0.1'\n inc = include_directories('include')\n \n subdir('Documentation')\n+subdir('include')\n subdir('lib')\n subdir('test')\n subdir('utils')\ndiff --git a/test/init.cpp b/test/init.cpp\nindex 182728d349a3..8c8ec9adfb83 100644\n--- a/test/init.cpp\n+++ b/test/init.cpp\n@@ -1,4 +1,4 @@\n-#include \n+#include \n \n int main(void)\n {\n","prefixes":["libcamera-devel","2/2"]}