isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Always pass --quiet to g-ir-scanner

Browse Source 
This makes the build less verbose, as all .gir generation except for
clutters didn't pass --quiet to g-ir-scanner, making it output long
linking commands. Do this by adding a common introspection_args
variable.

While at it, put -U_GNU_SOURCE in there too, as it was always passed
everywhere as without it the scanner would log warnings.
This commit is contained in:
Jonas Ådahl 2018-12-22 11:28:46 +01:00
parent d539fe28d5
commit f7d4a727a8
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter/meson.build
View File

@ -540,10 +540,7 @@ libmutter_clutter_dep = declare_dependency(
) )
if have_introspection if have_introspection
clutter_introspection_args = clutter_c_args + [ clutter_introspection_args = introspection_args + clutter_c_args
'-U_GNU_SOURCE', # _GNU_SOURCE triggers warnings in g-ir-scanner
'--quiet',
]
libmutter_clutter_gir = gnome.generate_gir(libmutter_clutter, libmutter_clutter_gir = gnome.generate_gir(libmutter_clutter,
sources: [ sources: [

3
cogl/cogl-pango/meson.build
View File

@ -54,10 +54,9 @@ if have_introspection
pango_dep, pango_dep,
libmutter_cogl_pango_dep, libmutter_cogl_pango_dep,
], ],
extra_args: [ extra_args: introspection_args + [
'-UCOGL_COMPILATION', '-UCOGL_COMPILATION',
'-DG_LOG_DOMAIN=\"CoglPango\"', '-DG_LOG_DOMAIN=\"CoglPango\"',
'-U_GNU_SOURCE',
], ],
install_dir_gir: pkglibdir, install_dir_gir: pkglibdir,
install_dir_typelib: pkglibdir, install_dir_typelib: pkglibdir,

3
cogl/cogl/meson.build
View File

@ -488,14 +488,13 @@ if have_introspection
namespace: 'Cogl', namespace: 'Cogl',
includes: ['GL-1.0', 'GObject-2.0'], includes: ['GL-1.0', 'GObject-2.0'],
dependencies: [cogl_deps], dependencies: [cogl_deps],
extra_args: [ extra_args: introspection_args + [
'-UCOGL_COMPILATION', '-UCOGL_COMPILATION',
'-D__COGL_H_INSIDE__', '-D__COGL_H_INSIDE__',
'-D__COGL_XLIB_H_INSIDE__', '-D__COGL_XLIB_H_INSIDE__',
'-D__COGL_EGL_H_INSIDE__', '-D__COGL_EGL_H_INSIDE__',
'-D__COGL_GLX_H_INSIDE__', '-D__COGL_GLX_H_INSIDE__',
'-DCOGL_GIR_SCANNING', '-DCOGL_GIR_SCANNING',
'-U_GNU_SOURCE',
], ],
install_dir_gir: pkglibdir, install_dir_gir: pkglibdir,
install_dir_typelib: pkglibdir, install_dir_typelib: pkglibdir,

5
meson.build
View File

@ -241,6 +241,11 @@ endif
have_introspection = get_option('introspection') have_introspection = get_option('introspection')
if have_introspection if have_introspection
gobject_introspection_dep = dependency('gobject-introspection-1.0') gobject_introspection_dep = dependency('gobject-introspection-1.0')
introspection_args = [
'--quiet',
'-U_GNU_SOURCE',
]
endif endif
have_cogl_tests = get_option('cogl_tests') have_cogl_tests = get_option('cogl_tests')

4
src/meson.build
View File

@ -820,9 +820,7 @@ if have_introspection
mutter_deps, mutter_deps,
libmutter_dep, libmutter_dep,
], ],
extra_args: mutter_c_args + [ extra_args: mutter_c_args + introspection_args,
'-U_GNU_SOURCE',
],
install_dir_gir: pkglibdir, install_dir_gir: pkglibdir,
install_dir_typelib: pkglibdir, install_dir_typelib: pkglibdir,
install: true install: true