diff options
-rw-r--r-- | protocols/xdg-shell.xml (renamed from xdg-shell.xml) | 0 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 9 | ||||
-rw-r--r-- | wayland/client.c | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/xdg-shell.xml b/protocols/xdg-shell.xml index 776438be..776438be 100644 --- a/xdg-shell.xml +++ b/protocols/xdg-shell.xml | |||
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 5a46ffb8..5cf4ff05 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -1,16 +1,18 @@ | |||
1 | project (swaybg) | 1 | project(swaybg) |
2 | 2 | ||
3 | find_package(Wayland REQUIRED) | 3 | find_package(Wayland REQUIRED) |
4 | find_package(Cairo REQUIRED) | 4 | find_package(Cairo REQUIRED) |
5 | find_package(Pango REQUIRED) | 5 | find_package(Pango REQUIRED) |
6 | 6 | ||
7 | include(Wayland) | 7 | include(Wayland) |
8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell) | 8 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) |
9 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" xdg-shell) | ||
9 | 10 | ||
10 | include_directories( | 11 | include_directories( |
11 | ${WAYLAND_CLIENT_INCLUDE_DIR} | 12 | ${WAYLAND_CLIENT_INCLUDE_DIR} |
12 | ${CAIRO_INCLUDE_DIRS} | 13 | ${CAIRO_INCLUDE_DIRS} |
13 | ${PANGO_INCLUDE_DIRS} | 14 | ${PANGO_INCLUDE_DIRS} |
15 | ${CMAKE_CURRENT_BINARY_DIR} | ||
14 | ) | 16 | ) |
15 | 17 | ||
16 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 18 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
@@ -21,9 +23,10 @@ add_executable(swaybg | |||
21 | ${sources} | 23 | ${sources} |
22 | ${wl_sources} | 24 | ${wl_sources} |
23 | ${common} | 25 | ${common} |
26 | ${proto-xdg-shell} | ||
24 | ) | 27 | ) |
25 | 28 | ||
26 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} -lm) | 29 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) |
27 | 30 | ||
28 | install( | 31 | install( |
29 | TARGETS swaybg | 32 | TARGETS swaybg |
diff --git a/wayland/client.c b/wayland/client.c index 116538cf..190d5ecb 100644 --- a/wayland/client.c +++ b/wayland/client.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #include <wayland-client.h> | 1 | #include <wayland-client.h> |
2 | #include "wayland-xdg-shell-client-protocol.h" | ||
2 | #include <cairo/cairo.h> | 3 | #include <cairo/cairo.h> |
3 | #include <pango/pangocairo.h> | 4 | #include <pango/pangocairo.h> |
4 | #include <stdlib.h> | 5 | #include <stdlib.h> |