[libcamera-devel] [PATCH 03/16] libcamera: Move libcamera.so pkg-config file generation

[Kieran Bingham]

Hi Laurent,

On 25/06/2021 04:18, Laurent Pinchart wrote:
> Hi Kieran,
> 
> Thank you for the patch.

You're welcome ...

Anything further to add ? ;-)


> 
> On Fri, Jun 25, 2021 at 02:35:26AM +0100, Kieran Bingham wrote:
>> The pkg-config file for the main libcamera.so is generated
>> at the top level meson.build.
>>
>> Move this to the actual core libcamera build structure to be
>> consistent and keep it next to the library construction.
>>
>> Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>> ---
>>  meson.build               | 8 --------
>>  src/libcamera/meson.build | 8 ++++++++
>>  2 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 4d7d936f09e2..6eed0d8c4a44 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -164,14 +164,6 @@ run_command('ln', '-fsT', meson.source_root(), meson.build_root() / 'source')
>>  
>>  configure_file(output : 'config.h', configuration : config_h)
>>  
>> -pkg_mod = import('pkgconfig')
>> -pkg_mod.generate(libraries : libcamera,
>> -                 version : '1.0',
>> -                 name : 'libcamera',
>> -                 filebase : 'camera',
>> -                 description : 'Complex Camera Support Library',
>> -                 subdirs : 'libcamera')
>> -
>>  # Check for python installation and modules.
>>  py_mod = import('python')
>>  py_mod.find_installation('python3', modules: py_modules)
>> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
>> index d9b5bfae69fd..e4c60e736697 100644
>> --- a/src/libcamera/meson.build
>> +++ b/src/libcamera/meson.build
>> @@ -156,4 +156,12 @@ libcamera_dep = declare_dependency(sources : [
>>                                     include_directories : libcamera_includes,
>>                                     link_with : libcamera)
>>  
>> +pkg_mod = import('pkgconfig')
>> +pkg_mod.generate(libraries: libcamera,
>> +                 version : '1.0',
>> +                 name : 'libcamera',
>> +                 filebase : 'camera',
>> +                 description : 'Complex Camera Support Library',
>> +                 subdirs : 'libcamera')
>> +
>>  subdir('proxy/worker')
>