dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extensions: do not build Vala plug-in without GObject Introspection. 

Though GObject Introspection is normally not an option, the only case we
don't build it yet is when cross-compiling (as we haven't found the
right way to do it). So let's not build the Goat Exercise plug-in in
Vala in such case as we needed the introspected libgimp.
This commit is contained in:
Jehan 2020-10-18 00:34:02 +02:00
parent 22b516a1cc
commit 326b2feddb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/goat-exercises/meson.build
View File

@ -42,7 +42,7 @@ install_data(
# Vala version # Vala version
if have_vala if have_vala and have_gobject_introspection
exe = executable('goat-exercise-vala', exe = executable('goat-exercise-vala',
'goat-exercise-vala.vala', 'goat-exercise-vala.vala',
include_directories: [ rootInclude, ], include_directories: [ rootInclude, ],

2
libgimp/meson.build
View File

@ -383,6 +383,7 @@ libgimpui_introspectable_files = [
] ]
if meson.is_cross_build() if meson.is_cross_build()
have_gobject_introspection = false
gobject_introspection_warning = '\n '.join(['', gobject_introspection_warning = '\n '.join(['',
'GObject Introspection is disabled while cross-compiling because', 'GObject Introspection is disabled while cross-compiling because',
'GI tools do not manage to properly generate introspection data', 'GI tools do not manage to properly generate introspection data',
@ -393,6 +394,7 @@ if meson.is_cross_build()
warning(gobject_introspection_warning) warning(gobject_introspection_warning)
warnings += gobject_introspection_warning warnings += gobject_introspection_warning
else else
have_gobject_introspection = true
libgimp_gir_includes = [ libgimp_gir_includes = [
'Babl-0.1', 'Babl-0.1',
'cairo-1.0', 'cairo-1.0',