From 556961648b1799572b18a83eb4f42f67ff41bdb6 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Mon, 21 Sep 2015 22:18:14 +0200 Subject: Look for renderers on right location --- lib/library.c | 2 +- lib/version.h.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/library.c b/lib/library.c index 02c2af8..82c027b 100644 --- a/lib/library.c +++ b/lib/library.c @@ -122,7 +122,7 @@ bm_init(void) if (renderers.count > 0) return true; - static const char *rpath = INSTALL_PREFIX "/lib/bemenu"; + static const char *rpath = INSTALL_LIBDIR "/bemenu"; const char *path = secure_getenv("BEMENU_RENDERER"); if (path) diff --git a/lib/version.h.in b/lib/version.h.in index a6b287c..30d3ee2 100644 --- a/lib/version.h.in +++ b/lib/version.h.in @@ -1,4 +1,5 @@ #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" +#define INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" #define BM_VERSION "@BEMENU_VERSION@" #define BM_PLUGIN_VERSION "@BEMENU_VERSION@-@GIT_SHA1@" -- cgit v1.2.3-70-g09d2 From 25218f98fa138d8bceaa8e0bf5d5444727a22f13 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Mon, 21 Sep 2015 23:41:53 +0200 Subject: Check explicitly for Xinerama Xinerama doesn't need to be present even when base X11 is. Check it explicitly. --- lib/renderers/x11/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/renderers/x11/CMakeLists.txt b/lib/renderers/x11/CMakeLists.txt index e669050..7081e25 100644 --- a/lib/renderers/x11/CMakeLists.txt +++ b/lib/renderers/x11/CMakeLists.txt @@ -1,7 +1,7 @@ FIND_PACKAGE(X11) FIND_PACKAGE(Cairo) -if (X11_FOUND AND CAIRO_FOUND AND PANGO_FOUND) +if (X11_FOUND AND X11_Xinerama_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