diff options
| author | emersion <contact@emersion.fr> | 2018-09-02 21:42:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-02 21:42:46 +0200 |
| commit | 3af9588eb4aab0b4f45edf2601c9a7ff0846861f (patch) | |
| tree | 6f320a55332ced11092220903bd2590e513f8c29 | |
| parent | e438342157272f6a807ea28ef1b554e01530ead8 (diff) | |
| parent | 4ece26e511eaabca55fff216aa2f925d2c28ad44 (diff) | |
| download | sway-3af9588eb4aab0b4f45edf2601c9a7ff0846861f.tar.xz | |
Merge pull request #2562 from RyanDwyer/ld-library-path
Add meson option for LD_LIBRARY_PATH
| -rw-r--r-- | meson.build | 12 | ||||
| -rw-r--r-- | meson_options.txt | 11 |
2 files changed, 13 insertions, 10 deletions
diff --git a/meson.build b/meson.build index d5b33e6b..eb5cba84 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 @@ -120,6 +120,8 @@ else endif add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') +add_project_arguments('-D_LD_LIBRARY_PATH="@0@"'.format(get_option('ld-library-path')), language: 'c') + sway_inc = include_directories('include') subdir('include') @@ -168,7 +170,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 +186,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 +197,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 +209,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..50d646fd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,7 @@ -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('ld-library-path', type: 'string', value: '', description: 'The LD_LIBRARY_PATH environment variable.') +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') |