diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-02 22:58:15 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-02 22:58:15 +1000 |
| commit | 7795f733d8c72f3467c2ac04e3d2633c79601935 (patch) | |
| tree | 7eafff388bbfed88e7158848fbd873515796123d | |
| parent | 159edc6d13db42b15b28c7ea58cdf2371d29297d (diff) | |
Use dashes in meson option names
| -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 add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') -version = get_option('sway_version') +version = get_option('sway-version') if version != '' version = '"@0@"'.format(version) else @@ -168,7 +168,7 @@ install_data( install_dir: datadir + '/wayland-sessions' ) -if (get_option('default_wallpaper')) +if (get_option('default-wallpaper')) wallpaper_files = files( 'assets/Sway_Wallpaper_Blue_768x1024.png', 'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png', @@ -184,7 +184,7 @@ if (get_option('default_wallpaper')) install_data(wallpaper_files, install_dir: wallpaper_install_dir) endif -if (get_option('zsh_completions')) +if (get_option('zsh-completions')) zsh_files = files( 'completions/zsh/_sway', 'completions/zsh/_swaylock', @@ -195,7 +195,7 @@ if (get_option('zsh_completions')) install_data(zsh_files, install_dir: zsh_install_dir) endif -if (get_option('bash_completions')) +if (get_option('bash-completions')) bash_files = files( 'completions/bash/sway', 'completions/bash/swayidle', @@ -207,7 +207,7 @@ if (get_option('bash_completions')) install_data(bash_files, install_dir: bash_install_dir) endif -if (get_option('fish_completions')) +if (get_option('fish-completions')) fish_files = files( 'completions/fish/sway.fish', '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 @@ -option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') -option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') -option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') -option('bash_completions', type: 'boolean', value: true, description: 'Install bash shell completions.') -option('fish_completions', type: 'boolean', value: true, description: 'Install fish shell completions.') +option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') +option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') +option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') +option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') +option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.') option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications') |