diff options
| author | Robert Mader <robert.mader@posteo.de> | 2019-05-30 17:28:07 +0200 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-05-31 16:03:43 +0000 |
| commit | 4887de533cc467e5d420a4df014188d4ffdac3f6 (patch) | |
| tree | de34fb1b6519933ad40ded1ade5d2a999f4c1f15 | |
| parent | 57945a730f39113a23794896b98dd75880edec11 (diff) | |
| download | mutter-4887de533cc467e5d420a4df014188d4ffdac3f6.tar.gz | |
meson: Do not use clutter_c_args for GIR
Certain arguments like `-fno-omit-frame-pointer` break GIR creation.
Lets handle this like we do for the rest of mutter and duplicate the
relevant arguments from `clutter_c_args`.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/601
| -rw-r--r-- | clutter/clutter/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index 671d790df..abc251413 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -504,7 +504,12 @@ libmutter_clutter_dep = declare_dependency( ) if have_introspection - clutter_introspection_args = introspection_args + clutter_c_args + clutter_introspection_args = introspection_args + [ + '-DCLUTTER_SYSCONFDIR="@0@"'.format(join_paths(prefix, sysconfdir)), + '-DCLUTTER_COMPILATION=1', + '-DCOGL_DISABLE_DEPRECATION_WARNINGS', + '-DG_LOG_DOMAIN="Clutter"' + ] libmutter_clutter_gir = gnome.generate_gir(libmutter_clutter, sources: [ |