mirror/bemenu
1
0
Fork 0
mirror of https://github.com/Cloudef/bemenu synced 2024-11-24 01:44:16 +01:00
Code Issues

Merge pull request #20 from sleep-walker/master

Browse Source 
path configuration - 2nd part, prevent clashing of ncurses symbol, xinerama check
This commit is contained in:
Jari Vetoniemi 2015-09-22 10:41:17 +03:00
commit f25a4146e1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/library.c
View File

@ -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)

2
lib/renderers/x11/CMakeLists.txt
View File

@ -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
lib/version.h.in
View File

@ -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@"