From d758754f200f584b732d2d8d7eccabc2249e57fa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 Dec 2022 21:10:55 -0500 Subject: [PATCH] build: Lift gir and build_gir to toplevel build_gir is used in multiple subdirectories, so it is a bit nasty that it is defined in one too. --- gtk/meson.build | 3 --- meson.build | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index 61185696dd..7ac245419a 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -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', diff --git a/meson.build b/meson.build index d0d3b432c5..80304b0edd 100644 --- a/meson.build +++ b/meson.build @@ -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') -- 2.30.2