diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-11-18 17:59:17 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-11-18 17:59:35 -0500 |
| commit | 929537c158fc415f557b818eb28f1759a4e62ee6 (patch) | |
| tree | feb36749c1255bbe5955a33a19f6f50571b616cc | |
| parent | 86372d00db86502cb41ae645b917c8191c22c994 (diff) | |
Generate protocol headers
| -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 @@ -project (swaybg) +project(swaybg) find_package(Wayland REQUIRED) find_package(Cairo REQUIRED) find_package(Pango REQUIRED) include(Wayland) -WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell) +set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) +WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" xdg-shell) include_directories( ${WAYLAND_CLIENT_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} ) FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) @@ -21,9 +23,10 @@ add_executable(swaybg ${sources} ${wl_sources} ${common} + ${proto-xdg-shell} ) -TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} -lm) +TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) install( 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 @@ #include <wayland-client.h> +#include "wayland-xdg-shell-client-protocol.h" #include <cairo/cairo.h> #include <pango/pangocairo.h> #include <stdlib.h> |