[libcamera-devel] pkgconfig: Fix include directory path

3701 diff mbox series

From: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Should be $includedir/libcamera, as we install into a subdirectory name
'libcamera'. This is fixed by passing the 'subdirs' argument to the pkgconfig
generator.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Hi Nicolas,

Thank you for the patch.

On Thu, May 07, 2020 at 10:48:52AM -0400, Nicolas Dufresne wrote:
> From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> 
> Should be $includedir/libcamera, as we install into a subdirectory name
> 'libcamera'. This is fixed by passing the 'subdirs' argument to the pkgconfig
> generator.
> 
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

I will give a couple of days for others to chime in if they want, and
will then merge the patch.

> ---
>  meson.build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 6c571a1..59829e1 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -116,4 +116,5 @@ pkg_mod.generate(libraries : libcamera,
>                   version : '1.0',
>                   name : 'libcamera',
>                   filebase : 'camera',
> -                 description : 'Complex Camera Support Library')
> +                 description : 'Complex Camera Support Library',
> +                 subdirs : 'libcamera')

Hi Nicolas, Laurent,

On 08/05/2020 12:30, Laurent Pinchart wrote:
> Hi Nicolas,
> 
> Thank you for the patch.
> 
> On Thu, May 07, 2020 at 10:48:52AM -0400, Nicolas Dufresne wrote:
>> From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>>
>> Should be $includedir/libcamera, as we install into a subdirectory name
>> 'libcamera'. This is fixed by passing the 'subdirs' argument to the pkgconfig
>> generator.
>>
>> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> I will give a couple of days for others to chime in if they want, and
> will then merge the patch.

This is fine by me. The extra layer of hierarchy seems a bit redundant
now, but indeed if we ever do need to do an ABI/API change then we can
utilise it for libcamera2...

Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> 
>> ---
>>  meson.build | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 6c571a1..59829e1 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -116,4 +116,5 @@ pkg_mod.generate(libraries : libcamera,
>>                   version : '1.0',
>>                   name : 'libcamera',
>>                   filebase : 'camera',
>> -                 description : 'Complex Camera Support Library')
>> +                 description : 'Complex Camera Support Library',
>> +                 subdirs : 'libcamera')
>