Skip to content

Commit 9167b98

Browse files
committed
build: Set glib-compile-resources dependency in base meson.build file
For consistency, assign all dependencies at the same place.
1 parent cfed84a commit 9167b98

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

common/gnome-shell/meson.build

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# supported versions
22
gnome_shell_versions = ['3.28', '3.30', '3.32', '3.34', '3.36', '3.38', '40', '41']
33

4-
# glib-compile-resources dependency
5-
if get_option('gnome_shell_gresource')
6-
glib_compile_resources = find_program('glib-compile-resources')
7-
endif
8-
94
# gnome-shell version
105
gnome_shell = find_program('gnome-shell', required : false)
116

common/gtk-3.0/meson.build

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# glib-compile-resources dependency
2-
glib_compile_resources = find_program('glib-compile-resources')
3-
41
# render PNG assets
52

63
gtk3_asset_names = run_command(

common/gtk-4.0/meson.build

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# supported versions
22
gtk4_versions = ['4.0', '4.2']
33

4-
# glib-compile-resources dependency
5-
glib_compile_resources = find_program('glib-compile-resources')
6-
74
# determine gtk4 version
85
if get_option('gtk4_version') != ''
96
gtk4_full_ver = get_option('gtk4_version')

meson.build

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@ foreach theme : ['gtk2', 'gtk3', 'gtk4', 'xfwm']
4343
endif
4444
endforeach
4545

46+
# glib-compile-resources dependency
47+
foreach theme : ['gnome-shell', 'gtk3', 'gtk4']
48+
if theme in get_option('themes')
49+
if theme == 'gnome-shell' and not get_option('gnome_shell_gresource')
50+
continue
51+
endif
52+
glib_compile_resources = find_program('glib-compile-resources')
53+
break
54+
endif
55+
endforeach
56+
4657
install_file = meson.source_root() / 'meson/install-file.py'
4758

4859
meson.add_dist_script('meson/render-assets.py')

0 commit comments

Comments
 (0)