diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-04 01:38:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-04 01:38:09 +0000 |
| commit | 12a540c284aa3217e097ce1c36f9d5491717f3b9 (patch) | |
| tree | 80412d51f6210ed16e8ae68492f8a5ca02c04473 | |
| parent | 58ab9ddc40a120fafcf642437ee1ea5c03c7b155 (diff) | |
| parent | 592b33cb48fabb02d416814e3b476cb03c37e98b (diff) | |
| download | gtk+-12a540c284aa3217e097ce1c36f9d5491717f3b9.tar.gz | |
Merge branch 'ebassi/for-master' into 'master'
Graphene is a dependency of Gsk, not Gdk
See merge request GNOME/gtk!3149
| -rw-r--r-- | gtk/meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/meson.build b/gtk/meson.build index c1b2186e89..42cb07a205 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1142,12 +1142,6 @@ if build_gir # the installed one gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', ] - if graphene_dep.type_name() == 'internal' - gdk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0) - else - gdk_gir_inc += 'Graphene-1.0' - endif - if pixbuf_dep.type_name() == 'internal' gdk_gir_inc += subproject('gdk-pixbuf').get_variable('gdkpixbuf_gir').get(0) else @@ -1211,6 +1205,12 @@ if build_gir gsk_gir_inc = [ gdk_gir[0] ] + if graphene_dep.type_name() == 'internal' + gsk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0) + else + gsk_gir_inc += 'Graphene-1.0' + endif + gsk_gir = gnome.generate_gir(libgtk, sources: gsk_public_headers + gsk_public_sources + [ gskenum_h ], namespace: 'Gsk', |