diff options
author | 2015-12-20 11:56:13 -0500 | |
---|---|---|
committer | 2015-12-20 11:56:13 -0500 | |
commit | dfc23086fd9597a5f9c7182851052435e134be5f (patch) | |
tree | 946a056785f05744932f21538a90f5687deb299c /CMake | |
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 'CMake')
-rw-r--r-- | CMake/FindGdkPixbuf.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMake/FindGdkPixbuf.cmake b/CMake/FindGdkPixbuf.cmake index 53bb0501..4ea1d5b9 100644 --- a/CMake/FindGdkPixbuf.cmake +++ b/CMake/FindGdkPixbuf.cmake | |||
@@ -29,6 +29,7 @@ IF(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) | |||
29 | # Report results | 29 | # Report results |
30 | IF(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS) | 30 | IF(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS) |
31 | SET(GDK_PIXBUF_FOUND 1) | 31 | SET(GDK_PIXBUF_FOUND 1) |
32 | SET(GdkPixbuf_FOUND 1) | ||
32 | IF(NOT GdkPixbuf_FIND_QUIETLY) | 33 | IF(NOT GdkPixbuf_FIND_QUIETLY) |
33 | MESSAGE(STATUS "Found GdkPixbuf: ${GDK_PIXBUF_LIBRARIES}") | 34 | MESSAGE(STATUS "Found GdkPixbuf: ${GDK_PIXBUF_LIBRARIES}") |
34 | ENDIF(NOT GdkPixbuf_FIND_QUIETLY) | 35 | ENDIF(NOT GdkPixbuf_FIND_QUIETLY) |
@@ -41,6 +42,8 @@ IF(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) | |||
41 | ENDIF(NOT GdkPixbuf_FIND_QUIETLY) | 42 | ENDIF(NOT GdkPixbuf_FIND_QUIETLY) |
42 | ENDIF(GdkPixbuf_FIND_REQUIRED) | 43 | ENDIF(GdkPixbuf_FIND_REQUIRED) |
43 | ENDIF(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS) | 44 | ENDIF(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS) |
45 | ELSE(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) | ||
46 | SET(GdkPixbuf_FOUND 1) | ||
44 | ENDIF(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) | 47 | ENDIF(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) |
45 | 48 | ||
46 | # Hide advanced variables from CMake GUIs | 49 | # Hide advanced variables from CMake GUIs |