summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-02 22:58:15 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-02 22:58:15 +1000
commit7795f733d8c72f3467c2ac04e3d2633c79601935 (patch)
tree7eafff388bbfed88e7158848fbd873515796123d
parentMerge pull request #2559 from RyanDwyer/xwayland-check-modal (diff)
downloadsway-7795f733d8c72f3467c2ac04e3d2633c79601935.tar.gz
sway-7795f733d8c72f3467c2ac04e3d2633c79601935.tar.zst
sway-7795f733d8c72f3467c2ac04e3d2633c79601935.zip
Use dashes in meson option names
-rw-r--r--meson.build10
-rw-r--r--meson_options.txt10
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
107add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') 107add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
108 108
109version = get_option('sway_version') 109version = get_option('sway-version')
110if version != '' 110if version != ''
111 version = '"@0@"'.format(version) 111 version = '"@0@"'.format(version)
112else 112else
@@ -168,7 +168,7 @@ install_data(
168 install_dir: datadir + '/wayland-sessions' 168 install_dir: datadir + '/wayland-sessions'
169) 169)
170 170
171if (get_option('default_wallpaper')) 171if (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)
185endif 185endif
186 186
187if (get_option('zsh_completions')) 187if (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)
196endif 196endif
197 197
198if (get_option('bash_completions')) 198if (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)
208endif 208endif
209 209
210if (get_option('fish_completions')) 210if (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 @@
1option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') 1option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.')
2option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') 2option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
3option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') 3option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
4option('bash_completions', type: 'boolean', value: true, description: 'Install bash shell completions.') 4option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.')
5option('fish_completions', type: 'boolean', value: true, description: 'Install fish shell completions.') 5option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
6option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications') 6option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications')