Handle build-time dependency checking better, so you can compile bemenu

without wayland or x11 easier.
This commit is contained in:
Jari Vetoniemi 2015-01-30 03:16:04 +02:00
parent f76cb71688
commit 98f44cbb78
2 changed files with 6 additions and 7 deletions

View File

@ -1,9 +1,9 @@
FIND_PACKAGE(Wayland)
FIND_PACKAGE(Cairo)
FIND_PACKAGE(Pango)
FIND_PACKAGE(XKBCommon)
if (WAYLAND_FOUND)
FIND_PACKAGE(Cairo REQUIRED)
FIND_PACKAGE(Pango REQUIRED)
FIND_PACKAGE(XKBCommon REQUIRED)
if (WAYLAND_FOUND AND CAIRO_FOUND AND PANGO_FOUND AND XKBCOMMON_FOUND)
INCLUDE(Wayland)
WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${WAYLAND_CLIENT_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})

View File

@ -1,8 +1,7 @@
FIND_PACKAGE(X11)
FIND_PACKAGE(Cairo)
if (X11_FOUND)
FIND_PACKAGE(Cairo REQUIRED)
FIND_PACKAGE(Pango REQUIRED)
if (X11_FOUND AND CAIRO_FOUND AND PANGO_FOUND)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})
ADD_LIBRARY(bemenu-renderer-x11 SHARED x11.c window.c xkb_unicode.c)
SET_TARGET_PROPERTIES(bemenu-renderer-x11 PROPERTIES PREFIX "")