From 7795f733d8c72f3467c2ac04e3d2633c79601935 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 2 Sep 2018 22:58:15 +1000 Subject: Use dashes in meson option names --- meson_options.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meson_options.txt') 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') -- cgit v1.2.3-70-g09d2 From 4ece26e511eaabca55fff216aa2f925d2c28ad44 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 2 Sep 2018 23:07:47 +1000 Subject: Add ld-library-path meson option --- meson.build | 2 ++ meson_options.txt | 1 + 2 files changed, 3 insertions(+) (limited to 'meson_options.txt') diff --git a/meson.build b/meson.build index 56f1141e..eb5cba84 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/meson_options.txt b/meson_options.txt index 911be2d6..50d646fd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,5 @@ 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.') -- cgit v1.2.3-70-g09d2