Merge remote-tracking branch 'origin/master' into tray-gdbus

This commit is contained in:
topisani
2018-10-04 18:04:36 +02:00
21 changed files with 132 additions and 63 deletions

View File

@ -56,7 +56,7 @@ src_files = files(
'src/client.cpp'
)
if find_program('sway').found()
if find_program('sway', required : false).found()
add_project_arguments('-DHAVE_SWAY', language: 'cpp')
src_files += [
'src/modules/sway/ipc/client.cpp',