[libvirt PATCH 127/351] meson: introduce src directory

[Pavel Hrdina]

On Wed, Jul 22, 2020 at 04:55:27PM +0200, Peter Krempa wrote:
> On Thu, Jul 16, 2020 at 11:56:03 +0200, Pavel Hrdina wrote:
> > WARN_FLAGS are not relevant for meson as all warning flags are set to
> > the whole project using add_project_arguments().
> > 
> > Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> > ---
> 
> 
> 
> > diff --git a/src/meson.build b/src/meson.build
> > new file mode 100644
> > index 00000000000..0f5b83744fd
> > --- /dev/null
> > +++ b/src/meson.build
> > @@ -0,0 +1,19 @@
> > +src_inc_dir = include_directories('.')
> > +
> > +src_dep = declare_dependency(
> > +  compile_args: [
> > +    '-DIN_LIBVIRT',
> > +    '-Dabs_top_builddir="@0@"'.format(meson.build_root()),
> > +    '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
> > +  ] + coverage_flags + win32_flags,
> > +  dependencies: [
> > +    glib_dep,
> > +    libxml_dep,
> > +  ],
> > +  include_directories: [
> > +    libvirt_inc,
> > +    src_inc_dir,
> > +    top_inc_dir,
> > +  ],
> > +  link_args: libvirt_relro + libvirt_no_indirect + coverage_flags + driver_modules_flags + win32_link_flags,
> 
> Could we do thes one per line?

Sure, originally I tried using:

    link_args: [
      libvirt_relro,
      libvirt_no_indirect,
      coverage_flags,
      driver_modules_flags,
      win32_link_flags,
    ],

but Meson complains here that the items has to be strings, which is sad,
I should probably report this. I guess it's only declare_dependency()
related as in other functions it's happy with this and will expand the
inner arrays.

I tried and this works so I'll go with it:

    link_args: (
      libvirt_relro
      + libvirt_no_indirect
      + coverage_flags
      + driver_modules_flags
      + win32_link_flags
    ),

Pavel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200722/4b1e22f6/attachment-0001.sig>