diff options
author | 2017-06-14 18:53:40 -0400 | |
---|---|---|
committer | 2017-06-14 18:53:40 -0400 | |
commit | 298f56353ef155f6a2ccc977c96b2ff5d971e65e (patch) | |
tree | dcb3b74f1dde93bce8657b7509662ffd7db667d0 /CMakeLists.txt | |
parent | Implement KDE's server-side decoration protocol (diff) | |
parent | Merge pull request #1234 from 4e554c4c/tray (diff) | |
download | sway-298f56353ef155f6a2ccc977c96b2ff5d971e65e.tar.gz sway-298f56353ef155f6a2ccc977c96b2ff5d971e65e.tar.zst sway-298f56353ef155f6a2ccc977c96b2ff5d971e65e.zip |
Merge branch 'master' into server-decoration
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed45830..c80f6361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -47,6 +47,7 @@ option(enable-swaybar "Enables the swaybar utility" YES) | |||
47 | option(enable-swaygrab "Enables the swaygrab utility" YES) | 47 | option(enable-swaygrab "Enables the swaygrab utility" YES) |
48 | option(enable-swaymsg "Enables the swaymsg utility" YES) | 48 | option(enable-swaymsg "Enables the swaymsg utility" YES) |
49 | option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES) | 49 | option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES) |
50 | option(enable-tray "Enables the swaybar tray" YES) | ||
50 | option(zsh-completions "Zsh shell completions" NO) | 51 | option(zsh-completions "Zsh shell completions" NO) |
51 | option(default-wallpaper "Installs the default wallpaper" YES) | 52 | option(default-wallpaper "Installs the default wallpaper" YES) |
52 | option(LD_LIBRARY_PATH "Configure sway's default LD_LIBRARY_PATH") | 53 | option(LD_LIBRARY_PATH "Configure sway's default LD_LIBRARY_PATH") |
@@ -64,9 +65,13 @@ find_package(Cairo REQUIRED) | |||
64 | find_package(Pango REQUIRED) | 65 | find_package(Pango REQUIRED) |
65 | find_package(GdkPixbuf) | 66 | find_package(GdkPixbuf) |
66 | find_package(PAM) | 67 | find_package(PAM) |
68 | find_package(DBus) | ||
67 | 69 | ||
68 | find_package(LibInput REQUIRED) | 70 | find_package(LibInput REQUIRED) |
69 | find_package(Libcap REQUIRED) | 71 | |
72 | if (CMAKE_SYSTEM_NAME STREQUAL Linux) | ||
73 | find_package(Libcap REQUIRED) | ||
74 | endif (CMAKE_SYSTEM_NAME STREQUAL Linux) | ||
70 | 75 | ||
71 | if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) | 76 | if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) |
72 | find_package(EpollShim REQUIRED) | 77 | find_package(EpollShim REQUIRED) |
@@ -87,6 +92,17 @@ else() | |||
87 | message(STATUS "Building without gdk-pixbuf, only png images supported.") | 92 | message(STATUS "Building without gdk-pixbuf, only png images supported.") |
88 | endif() | 93 | endif() |
89 | 94 | ||
95 | if (enable-tray) | ||
96 | if (DBUS_FOUND) | ||
97 | set(ENABLE_TRAY) | ||
98 | add_definitions(-DENABLE_TRAY) | ||
99 | else() | ||
100 | message(WARNING "Tray required but DBus was not found. Tray will not be included") | ||
101 | endif() | ||
102 | else() | ||
103 | message(STATUS "Building without the tray.") | ||
104 | endif() | ||
105 | |||
90 | include_directories(include) | 106 | include_directories(include) |
91 | 107 | ||
92 | add_subdirectory(protocols) | 108 | add_subdirectory(protocols) |