build: Lift gir and build_gir to toplevel
authorMatthias Clasen <mclasen@redhat.com>
Tue, 20 Dec 2022 02:10:55 +0000 (21:10 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 20 Dec 2022 03:38:38 +0000 (22:38 -0500)
build_gir is used in multiple subdirectories,
so it is a bit nasty that it is defined in
one too.

gtk/meson.build
meson.build

index 61185696dd79a0bfea9c160a081e89860c9d4fd3..7ac245419a011734c8df7c053e137e51a5100f0f 100644 (file)
@@ -1180,9 +1180,6 @@ libgtk = shared_library('gtk-4',
 gtk_dep_sources = [gtkversion, gtktypebuiltins_h]
 
 # Introspection
-gir = find_program('g-ir-scanner', required : get_option('introspection'))
-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-
 if build_gir
   gir_args = [
     '-DGTK_COMPILATION',
index d0d3b432c52ba44c209ff76d99af69229ecd9f44..80304b0edd34fca9ff7cc596615de61c33fb5d7f 100644 (file)
@@ -728,6 +728,11 @@ int main () {
   endif
 endif
 
+# Introspection
+gir = find_program('g-ir-scanner', required : get_option('introspection'))
+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
+
+
 project_build_root = meson.current_build_dir()
 
 subdir('gtk/css')