diff options
| author | Jari Vetoniemi <mailRoxas@gmail.com> | 2015-09-22 10:41:17 +0300 |
|---|---|---|
| committer | Jari Vetoniemi <mailRoxas@gmail.com> | 2015-09-22 10:41:17 +0300 |
| commit | f25a4146e1d31a2179df484c6544effcfc166b27 (patch) | |
| tree | b87634e4d5ccc0449a7d0a6d6fec0f69c0b4881d /lib | |
| parent | 092b6ed52d5617071a25befdc90cc1fd960fd685 (diff) | |
| parent | 25218f98fa138d8bceaa8e0bf5d5444727a22f13 (diff) | |
| download | bemenu-f25a4146e1d31a2179df484c6544effcfc166b27.tar.gz bemenu-f25a4146e1d31a2179df484c6544effcfc166b27.tar.bz2 bemenu-f25a4146e1d31a2179df484c6544effcfc166b27.zip | |
Merge pull request #20 from sleep-walker/master
path configuration - 2nd part, prevent clashing of ncurses symbol, xinerama check
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/library.c | 2 | ||||
| -rw-r--r-- | lib/renderers/x11/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/version.h.in | 1 |
3 files changed, 3 insertions, 2 deletions
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/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 "") 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@" |