[{"id":16,"web_url":"https://patchwork.libcamera.org/comment/16/","msgid":"<2913189.x1RixnIhKq@avalon>","date":"2018-11-27T01:22:55","subject":"Re: [libcamera-devel] [PATCH 2/2] include: Install include files","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Monday, 26 November 2018 16:01:11 EET Kieran Bingham wrote:\n> The include directory was defined but not installed.\n> \n> Add it to the meson build structure to incorporate it as part of the\n> library install.\n> \n> To facilitate the same include paths in our internal includes, update\n> the structure for headers to match the install structure.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> ---\n> \n> DESTDIR=/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\n> \n> diff --git a/include/libcamera.h b/include/libcamera/libcamera.h\n> similarity index 100%\n> rename from include/libcamera.h\n> rename to include/libcamera/libcamera.h\n> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> new file mode 100644\n> index 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')\n\nIs there any way to locate this file one folder up (in include/) and use \nwildcards for public_api ?\n\nAs commented for a previous patch, I'm still worried about using spaces and \ntabs for indentation.\n\nThe rest looks good to me, so with this fixed,\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> diff --git a/include/meson.build b/include/meson.build\n> new file mode 100644\n> index 000000000000..4ce9668caa7b\n> --- /dev/null\n> +++ b/include/meson.build\n> @@ -0,0 +1 @@\n> +subdir('libcamera')\n> diff --git a/meson.build b/meson.build\n> index 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')\n> diff --git a/test/init.cpp b/test/init.cpp\n> index 182728d349a3..8c8ec9adfb83 100644\n> --- a/test/init.cpp\n> +++ b/test/init.cpp\n> @@ -1,4 +1,4 @@\n> -#include <libcamera.h>\n> +#include <libcamera/libcamera.h>\n> \n>  int main(void)\n>  {","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 11B4B60B0C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Nov 2018 02:22:32 +0100 (CET)","from avalon.localnet (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8759F59;\n\tTue, 27 Nov 2018 02:22:31 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1543281751;\n\tbh=ld8hdGDBbbTppxf9IsyDAlzSuaB6hdVDRTMkETW6t7I=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MPawKABt1b9d2ORfcGMyRev7k7GBEC7H3jIh5ovsxipSWU000p3H9+qYGP3AqG+5c\n\t6GloBF3bqJQA4t+nHO/QZTv6wtW+SYa0fbCP8vn25oXJ1AAba4RHv0CXeL7fWiy8aE\n\thTX3Z7pwck7FpzY/YwtUDkWQ7fCa/XUyDvWS7dHQ=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 27 Nov 2018 03:22:55 +0200","Message-ID":"<2913189.x1RixnIhKq@avalon>","Organization":"Ideas on Board Oy","In-Reply-To":"<20181126140111.13255-3-kieran.bingham@ideasonboard.com>","References":"<20181126140111.13255-1-kieran.bingham@ideasonboard.com>\n\t<20181126140111.13255-3-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 27 Nov 2018 01:22:32 -0000"}},{"id":20,"web_url":"https://patchwork.libcamera.org/comment/20/","msgid":"<91c2aecd-9ab3-582f-9b87-168f5ca2da80@ideasonboard.com>","date":"2018-11-27T12:42:47","subject":"Re: [libcamera-devel] [PATCH 2/2] include: Install include files","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 27/11/2018 01:22, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Monday, 26 November 2018 16:01:11 EET Kieran Bingham wrote:\n>> The include directory was defined but not installed.\n>>\n>> Add it to the meson build structure to incorporate it as part of the\n>> library install.\n>>\n>> To facilitate the same include paths in our internal includes, update\n>> the structure for headers to match the install structure.\n>>\n>> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>>\n>> ---\n>>\n>> DESTDIR=/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\n>>\n>> diff --git a/include/libcamera.h b/include/libcamera/libcamera.h\n>> similarity index 100%\n>> rename from include/libcamera.h\n>> rename to include/libcamera/libcamera.h\n>> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n>> new file mode 100644\n>> index 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')\n> \n> Is there any way to locate this file one folder up (in include/) and use \n> wildcards for public_api ?\n\nNo, I'm afraid wildcards aren't allowed, even in the install targets it\nseems.\n\n> \n> As commented for a previous patch, I'm still worried about using spaces and \n> tabs for indentation.\n\nReplaced tabs for spaces.\n\n> \n> The rest looks good to me, so with this fixed,\n> \n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n>> diff --git a/include/meson.build b/include/meson.build\n>> new file mode 100644\n>> index 000000000000..4ce9668caa7b\n>> --- /dev/null\n>> +++ b/include/meson.build\n>> @@ -0,0 +1 @@\n>> +subdir('libcamera')\n>> diff --git a/meson.build b/meson.build\n>> index 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')\n>> diff --git a/test/init.cpp b/test/init.cpp\n>> index 182728d349a3..8c8ec9adfb83 100644\n>> --- a/test/init.cpp\n>> +++ b/test/init.cpp\n>> @@ -1,4 +1,4 @@\n>> -#include <libcamera.h>\n>> +#include <libcamera/libcamera.h>\n>>\n>>  int main(void)\n>>  {\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 37A9B60004\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Nov 2018 13:42:51 +0100 (CET)","from [192.168.0.21]\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 7E1A4544;\n\tTue, 27 Nov 2018 13:42:50 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1543322570;\n\tbh=cLZs/YpmEBRVny+rOYSI5zNfIbA0u5kt1I496sQcECY=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=wMAvQJN+UYsNKl+6NEiXDzPBz5OpNna7o67RYnOj4q6P0f2Kf9WAxwMqcxm4hVEVu\n\tTYSxPSqmCELgCiZY2U8y3YjXDWbWLibKNwz6YynnkR4xADATp+kDZb9i9veP+dx49L\n\tff+yUJjVq7x4ZElOBqCg05zEKmDJk8TD366Ivw0M=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20181126140111.13255-1-kieran.bingham@ideasonboard.com>\n\t<20181126140111.13255-3-kieran.bingham@ideasonboard.com>\n\t<2913189.x1RixnIhKq@avalon>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<91c2aecd-9ab3-582f-9b87-168f5ca2da80@ideasonboard.com>","Date":"Tue, 27 Nov 2018 12:42:47 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.2.1","MIME-Version":"1.0","In-Reply-To":"<2913189.x1RixnIhKq@avalon>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","Subject":"Re: [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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 27 Nov 2018 12:42:51 -0000"}}]