Skip to content

Commit c3164a8

Browse files
authored
Merge pull request #149 from dimkr/feature/system-gtk-layer-shell
Fix build failure if wayland-scanner is missing
2 parents 29e1346 + 79a0395 commit c3164a8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ if gtkver == 3
1414
default_options: ['default_library=static', 'introspection=false'],
1515
required: false,
1616
)
17-
gtk_layer_shell = proj.get_variable('gtk_layer_shell')
17+
if proj.found()
18+
gtk_layer_shell = proj.get_variable('gtk_layer_shell')
19+
endif
1820
endif
1921
else
2022
gtk = dependency('gtk+-2.0')

src/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if vte.found()
7373
else
7474
cfg.set('HAVE_VTE', 0)
7575
endif
76-
if gtkver == 3
76+
if gtkver == 3 and gtk_layer_shell.found()
7777
dep += [gtk_layer_shell]
7878
cfg.set('HAVE_GTK_LAYER_SHELL', 1)
7979
else

0 commit comments

Comments
 (0)