diff options
author | 2015-12-20 11:56:13 -0500 | |
---|---|---|
committer | 2015-12-20 11:56:13 -0500 | |
commit | dfc23086fd9597a5f9c7182851052435e134be5f (patch) | |
tree | 946a056785f05744932f21538a90f5687deb299c /wayland/CMakeLists.txt | |
parent | Update README screenshot (diff) | |
parent | make gdk-pixbuf dependency really optional (diff) | |
download | sway-dfc23086fd9597a5f9c7182851052435e134be5f.tar.gz sway-dfc23086fd9597a5f9c7182851052435e134be5f.tar.zst sway-dfc23086fd9597a5f9c7182851052435e134be5f.zip |
Merge pull request #377 from progandy/optional-pixbuf
make gdk-pixbuf dependency really optional
Diffstat (limited to 'wayland/CMakeLists.txt')
-rw-r--r-- | wayland/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt index 6519cd7d..282ea1aa 100644 --- a/wayland/CMakeLists.txt +++ b/wayland/CMakeLists.txt | |||
@@ -1,7 +1,6 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${PROTOCOLS_INCLUDE_DIRS} | 2 | ${PROTOCOLS_INCLUDE_DIRS} |
3 | ${PANGO_INCLUDE_DIRS} | 3 | ${PANGO_INCLUDE_DIRS} |
4 | ${GDK_PIXBUF_INCLUDE_DIRS} | ||
5 | ${XKBCOMMON_INCLUDE_DIRS} | 4 | ${XKBCOMMON_INCLUDE_DIRS} |
6 | ) | 5 | ) |
7 | 6 | ||
@@ -17,6 +16,14 @@ target_link_libraries(sway-wayland | |||
17 | sway-common | 16 | sway-common |
18 | sway-protocols | 17 | sway-protocols |
19 | ${PANGO_LIBRARIES} | 18 | ${PANGO_LIBRARIES} |
20 | ${GDK_PIXBUF_LIBRARIES} | ||
21 | ${XKBCOMMON_LIBRARIES} | 19 | ${XKBCOMMON_LIBRARIES} |
22 | ) | 20 | ) |
21 | |||
22 | if (WITH_GDK_PIXBUF) | ||
23 | include_directories( | ||
24 | ${GDK_PIXBUF_INCLUDE_DIRS} | ||
25 | ) | ||
26 | target_link_libraries(sway-wayland | ||
27 | ${GDK_PIXBUF_LIBRARIES} | ||
28 | ) | ||
29 | endif() | ||