diff options
-rw-r--r-- | meson.build | 10 | ||||
-rw-r--r-- | meson_options.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/meson.build b/meson.build index d5b33e6b..56f1141e 100644 --- a/meson.build +++ b/meson.build | |||
@@ -106,7 +106,7 @@ endif | |||
106 | 106 | ||
107 | add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') | 107 | add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') |
108 | 108 | ||
109 | version = get_option('sway_version') | 109 | version = get_option('sway-version') |
110 | if version != '' | 110 | if version != '' |
111 | version = '"@0@"'.format(version) | 111 | version = '"@0@"'.format(version) |
112 | else | 112 | else |
@@ -168,7 +168,7 @@ install_data( | |||
168 | install_dir: datadir + '/wayland-sessions' | 168 | install_dir: datadir + '/wayland-sessions' |
169 | ) | 169 | ) |
170 | 170 | ||
171 | if (get_option('default_wallpaper')) | 171 | if (get_option('default-wallpaper')) |
172 | wallpaper_files = files( | 172 | wallpaper_files = files( |
173 | 'assets/Sway_Wallpaper_Blue_768x1024.png', | 173 | 'assets/Sway_Wallpaper_Blue_768x1024.png', |
174 | 'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png', | 174 | 'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png', |
@@ -184,7 +184,7 @@ if (get_option('default_wallpaper')) | |||
184 | install_data(wallpaper_files, install_dir: wallpaper_install_dir) | 184 | install_data(wallpaper_files, install_dir: wallpaper_install_dir) |
185 | endif | 185 | endif |
186 | 186 | ||
187 | if (get_option('zsh_completions')) | 187 | if (get_option('zsh-completions')) |
188 | zsh_files = files( | 188 | zsh_files = files( |
189 | 'completions/zsh/_sway', | 189 | 'completions/zsh/_sway', |
190 | 'completions/zsh/_swaylock', | 190 | 'completions/zsh/_swaylock', |
@@ -195,7 +195,7 @@ if (get_option('zsh_completions')) | |||
195 | install_data(zsh_files, install_dir: zsh_install_dir) | 195 | install_data(zsh_files, install_dir: zsh_install_dir) |
196 | endif | 196 | endif |
197 | 197 | ||
198 | if (get_option('bash_completions')) | 198 | if (get_option('bash-completions')) |
199 | bash_files = files( | 199 | bash_files = files( |
200 | 'completions/bash/sway', | 200 | 'completions/bash/sway', |
201 | 'completions/bash/swayidle', | 201 | 'completions/bash/swayidle', |
@@ -207,7 +207,7 @@ if (get_option('bash_completions')) | |||
207 | install_data(bash_files, install_dir: bash_install_dir) | 207 | install_data(bash_files, install_dir: bash_install_dir) |
208 | endif | 208 | endif |
209 | 209 | ||
210 | if (get_option('fish_completions')) | 210 | if (get_option('fish-completions')) |
211 | fish_files = files( | 211 | fish_files = files( |
212 | 'completions/fish/sway.fish', | 212 | 'completions/fish/sway.fish', |
213 | 'completions/fish/swaylock.fish', | 213 | 'completions/fish/swaylock.fish', |
diff --git a/meson_options.txt b/meson_options.txt index 5e54607f..911be2d6 100644 --- a/meson_options.txt +++ b/meson_options.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') | 1 | option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') |
2 | option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') | 2 | option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') |
3 | option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') | 3 | option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') |
4 | option('bash_completions', type: 'boolean', value: true, description: 'Install bash shell completions.') | 4 | option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') |
5 | option('fish_completions', type: 'boolean', value: true, description: 'Install fish shell completions.') | 5 | option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.') |
6 | option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications') | 6 | option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications') |