diff options
author | emersion <contact@emersion.fr> | 2018-08-02 23:49:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 23:49:25 +0100 |
commit | 3a54e2291c017397ceff60511c29fe70d229bc8b (patch) | |
tree | d340b7776f945462f5ecffc830ada4d5fbe82f51 /meson.build | |
parent | Enable wlr-gamma-control-unstable-v1 (diff) | |
parent | Merge pull request #2411 from emersion/fullscreen-pointer-input (diff) | |
download | sway-3a54e2291c017397ceff60511c29fe70d229bc8b.tar.gz sway-3a54e2291c017397ceff60511c29fe70d229bc8b.tar.zst sway-3a54e2291c017397ceff60511c29fe70d229bc8b.zip |
Merge branch 'master' into wlr-gamma-control
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 1d40581a..2a020323 100644 --- a/meson.build +++ b/meson.build | |||
@@ -12,6 +12,7 @@ project( | |||
12 | add_project_arguments('-Wno-unused-parameter', language: 'c') | 12 | add_project_arguments('-Wno-unused-parameter', language: 'c') |
13 | add_project_arguments('-Wno-unused-function', language: 'c') | 13 | add_project_arguments('-Wno-unused-function', language: 'c') |
14 | add_project_arguments('-Wno-unused-result', language: 'c') | 14 | add_project_arguments('-Wno-unused-result', language: 'c') |
15 | add_project_arguments('-DWLR_USE_UNSTABLE', language: 'c') | ||
15 | 16 | ||
16 | cc = meson.get_compiler('c') | 17 | cc = meson.get_compiler('c') |
17 | 18 | ||
@@ -43,11 +44,17 @@ systemd = dependency('libsystemd', required: false) | |||
43 | elogind = dependency('libelogind', required: false) | 44 | elogind = dependency('libelogind', required: false) |
44 | math = cc.find_library('m') | 45 | math = cc.find_library('m') |
45 | rt = cc.find_library('rt') | 46 | rt = cc.find_library('rt') |
46 | xcb = dependency('xcb') | ||
47 | git = find_program('git', required: false) | 47 | git = find_program('git', required: false) |
48 | 48 | ||
49 | conf_data = configuration_data() | 49 | conf_data = configuration_data() |
50 | 50 | ||
51 | if get_option('enable-xwayland') | ||
52 | conf_data.set('HAVE_XWAYLAND', true) | ||
53 | xcb = dependency('xcb') | ||
54 | else | ||
55 | conf_data.set('HAVE_XWAYLAND', false) | ||
56 | endif | ||
57 | |||
51 | if gdk_pixbuf.found() | 58 | if gdk_pixbuf.found() |
52 | conf_data.set('HAVE_GDK_PIXBUF', true) | 59 | conf_data.set('HAVE_GDK_PIXBUF', true) |
53 | endif | 60 | endif |
@@ -75,6 +82,8 @@ if scdoc.found() | |||
75 | 'swaylock/swaylock.1.scd', | 82 | 'swaylock/swaylock.1.scd', |
76 | 'swaymsg/swaymsg.1.scd', | 83 | 'swaymsg/swaymsg.1.scd', |
77 | 'swayidle/swayidle.1.scd', | 84 | 'swayidle/swayidle.1.scd', |
85 | 'swaynag/swaynag.1.scd', | ||
86 | 'swaynag/swaynag.5.scd', | ||
78 | ] | 87 | ] |
79 | foreach filename : man_files | 88 | foreach filename : man_files |
80 | topic = filename.split('.')[-3].split('/')[-1] | 89 | topic = filename.split('.')[-3].split('/')[-1] |
@@ -123,6 +132,7 @@ subdir('swaybg') | |||
123 | subdir('swaybar') | 132 | subdir('swaybar') |
124 | subdir('swaylock') | 133 | subdir('swaylock') |
125 | subdir('swayidle') | 134 | subdir('swayidle') |
135 | subdir('swaynag') | ||
126 | 136 | ||
127 | config = configuration_data() | 137 | config = configuration_data() |
128 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) | 138 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) |
@@ -176,7 +186,6 @@ endif | |||
176 | if (get_option('zsh_completions')) | 186 | if (get_option('zsh_completions')) |
177 | zsh_files = files( | 187 | zsh_files = files( |
178 | 'completions/zsh/_sway', | 188 | 'completions/zsh/_sway', |
179 | 'completions/zsh/_swaygrab', | ||
180 | 'completions/zsh/_swaylock', | 189 | 'completions/zsh/_swaylock', |
181 | 'completions/zsh/_swaymsg', | 190 | 'completions/zsh/_swaymsg', |
182 | ) | 191 | ) |
@@ -184,3 +193,15 @@ if (get_option('zsh_completions')) | |||
184 | 193 | ||
185 | install_data(zsh_files, install_dir: zsh_install_dir) | 194 | install_data(zsh_files, install_dir: zsh_install_dir) |
186 | endif | 195 | endif |
196 | |||
197 | if (get_option('bash_completions')) | ||
198 | bash_files = files( | ||
199 | 'completions/bash/sway', | ||
200 | 'completions/bash/swayidle', | ||
201 | 'completions/bash/swaylock', | ||
202 | 'completions/bash/swaymsg', | ||
203 | ) | ||
204 | bash_install_dir = datadir + '/bash-completion/completions' | ||
205 | |||
206 | install_data(bash_files, install_dir: bash_install_dir) | ||
207 | endif | ||