Skip to content

Commit d2d660b

Browse files
Optionally install wayland session files (#12273)
1 parent 3e1fca6 commit d2d660b

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

data/meson.build

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ desktop_conf.set('bindir', join_paths(prefix, bindir))
2323
desktop_conf.set('libexecdir', join_paths(prefix, libexecdir))
2424
desktop_conf.set('VERSION', meson.project_version())
2525

26-
desktop_files = [
27-
'cinnamon.desktop',
28-
'cinnamon-wayland.desktop',
29-
'cinnamon2d.desktop',
30-
]
26+
desktop_files = ['cinnamon.desktop', 'cinnamon2d.desktop']
27+
if get_option('wayland')
28+
desktop_files += ['cinnamon-wayland.desktop']
29+
endif
3130

3231
foreach desktop_file : desktop_files
3332
desktop = configure_file(
@@ -47,7 +46,9 @@ foreach desktop_file : desktop_files
4746
endforeach
4847

4948
subdir('xdg-portal')
50-
subdir('wayland_sessions')
49+
if get_option('wayland')
50+
subdir('wayland_sessions')
51+
endif
5152
subdir('xsessions')
5253
subdir('services')
5354

meson.build

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,15 @@ else
166166
session_conf.set('REQUIRED', '')
167167
endif
168168

169-
foreach file : ['cinnamon.session', 'cinnamon2d.session', 'cinnamon-wayland.session']
169+
session_files = ['cinnamon.session', 'cinnamon2d.session']
170+
if get_option('wayland')
171+
session_files += ['cinnamon-wayland.session']
172+
endif
173+
174+
foreach session_file : session_files
170175
configure_file(
171-
input: file + '.in',
172-
output: file,
176+
input: session_file + '.in',
177+
output: session_file,
173178
configuration: session_conf,
174179
install_dir: join_paths(prefix, datadir, 'cinnamon-session', 'sessions'),
175180
)

meson_options.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@ option('py3modules_dir',
2323
value : '',
2424
description: 'Where to install python3 modules'
2525
)
26+
option('wayland',
27+
type : 'boolean',
28+
value : true,
29+
description: 'Enable wayland support'
30+
)
2631

0 commit comments

Comments
 (0)