forked from RepoMirrors/bemenu
Merge pull request #20 from sleep-walker/master
path configuration - 2nd part, prevent clashing of ncurses symbol, xinerama check
This commit is contained in:
commit
f25a4146e1
@ -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)
|
||||
|
@ -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 "")
|
||||
|
@ -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@"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user