diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-12-19 21:10:55 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-12-19 22:38:38 -0500 |
| commit | d758754f200f584b732d2d8d7eccabc2249e57fa (patch) | |
| tree | e54767876c518210fff4fbbe67536bbad6cf5652 | |
| parent | e049b6992ddd7a3198a6041c101c0012ef2588b6 (diff) | |
| download | gtk+-d758754f200f584b732d2d8d7eccabc2249e57fa.tar.gz | |
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.
| -rw-r--r-- | gtk/meson.build | 3 | ||||
| -rw-r--r-- | 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') |