From 98f44cbb78d2644e8dbf4c718b0d9d01c099eaec Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Fri, 30 Jan 2015 03:16:04 +0200
Subject: Handle build-time dependency checking better, so you can compile
bemenu without wayland or x11 easier.
---
lib/renderers/wayland/CMakeLists.txt | 8 ++++----
lib/renderers/x11/CMakeLists.txt | 5 ++---
2 files changed, 6 insertions(+), 7 deletions(-)
(limited to 'lib/renderers')
diff --git a/lib/renderers/wayland/CMakeLists.txt b/lib/renderers/wayland/CMakeLists.txt
index 8ff1de7..9d3ff3c 100644
--- a/lib/renderers/wayland/CMakeLists.txt
+++ b/lib/renderers/wayland/CMakeLists.txt
@@ -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})
diff --git a/lib/renderers/x11/CMakeLists.txt b/lib/renderers/x11/CMakeLists.txt
index 3357f34..2efdbb4 100644
--- a/lib/renderers/x11/CMakeLists.txt
+++ b/lib/renderers/x11/CMakeLists.txt
@@ -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 "")
--
cgit v1.2.3-70-g09d2