diff options
| author | Jari Vetoniemi <mailRoxas@gmail.com> | 2019-04-24 02:44:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 02:44:38 +0300 |
| commit | 6cc18e381c3b2e29d2bbb3fe1334da43e62f7ede (patch) | |
| tree | 7c89af37018877af331042d6e82f0e84dbd9ac42 | |
| parent | 8ad07cff1121ca8444aa74161792928adef21501 (diff) | |
| parent | 620ae690209a36b680524f4a4d8bec2f464f05fa (diff) | |
| download | bemenu-6cc18e381c3b2e29d2bbb3fe1334da43e62f7ede.tar.gz bemenu-6cc18e381c3b2e29d2bbb3fe1334da43e62f7ede.tar.bz2 bemenu-6cc18e381c3b2e29d2bbb3fe1334da43e62f7ede.zip | |
Merge pull request #52 from t6/patch-freebsd
FreeBSD support
| -rw-r--r-- | lib/renderers/wayland/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/renderers/wayland/wayland.c | 2 | ||||
| -rw-r--r-- | lib/renderers/x11/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/renderers/wayland/CMakeLists.txt b/lib/renderers/wayland/CMakeLists.txt index 8246908..dbe56c8 100644 --- a/lib/renderers/wayland/CMakeLists.txt +++ b/lib/renderers/wayland/CMakeLists.txt @@ -3,11 +3,15 @@ FIND_PACKAGE(Cairo REQUIRED) FIND_PACKAGE(Pango REQUIRED) FIND_PACKAGE(XKBCommon REQUIRED) +if (CMAKE_SYSTEM_NAME MATCHES "DragonFly" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + PKG_CHECK_MODULES(EPOLL_SHIM REQUIRED epoll-shim) +endif () + INCLUDE(Wayland) WAYLAND_ADD_PROTOCOL_CLIENT(proto-layer-shell "wlr-layer-shell-unstable-v1.xml" layer-shell) 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}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${WAYLAND_CLIENT_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${EPOLL_SHIM_INCLUDE_DIRS}) ADD_LIBRARY(bemenu-renderer-wayland SHARED wayland.c registry.c window.c ${proto-layer-shell} ${proto-xdg-shell}) SET_TARGET_PROPERTIES(bemenu-renderer-wayland PROPERTIES PREFIX "") -TARGET_LINK_LIBRARIES(bemenu-renderer-wayland ${BEMENU_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${XKBCOMMON_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +TARGET_LINK_LIBRARIES(bemenu-renderer-wayland ${BEMENU_LIBRARIES} ${WAYLAND_CLIENT_LINK_LIBRARIES} ${XKBCOMMON_LIBRARIES} ${CAIRO_LINK_LIBRARIES} ${PANGO_LINK_LIBRARIES} ${EPOLL_SHIM_LINK_LIBRARIES} m) INSTALL(TARGETS bemenu-renderer-wayland DESTINATION "${CMAKE_INSTALL_LIBDIR}/bemenu") diff --git a/lib/renderers/wayland/wayland.c b/lib/renderers/wayland/wayland.c index 442b0f6..603cd8b 100644 --- a/lib/renderers/wayland/wayland.c +++ b/lib/renderers/wayland/wayland.c @@ -286,7 +286,7 @@ constructor(struct bm_menu *menu) wl_list_insert(&wayland->windows, &window->link); } - if (!efd && (efd = epoll_create(EPOLL_CLOEXEC)) < 0) + if (!efd && (efd = epoll_create1(EPOLL_CLOEXEC)) < 0) goto fail; struct epoll_event ep; diff --git a/lib/renderers/x11/CMakeLists.txt b/lib/renderers/x11/CMakeLists.txt index 5f86fb6..7103120 100644 --- a/lib/renderers/x11/CMakeLists.txt +++ b/lib/renderers/x11/CMakeLists.txt @@ -5,5 +5,5 @@ FIND_PACKAGE(Pango REQUIRED) 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 "") -TARGET_LINK_LIBRARIES(bemenu-renderer-x11 ${BEMENU_LIBRARIES} ${X11_LIBRARIES} ${X11_Xinerama_LIB} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +TARGET_LINK_LIBRARIES(bemenu-renderer-x11 ${BEMENU_LIBRARIES} ${X11_LINK_LIBRARIES} ${X11_Xinerama_LIB} ${CAIRO_LINK_LIBRARIES} ${PANGO_LINK_LIBRARIES} m) INSTALL(TARGETS bemenu-renderer-x11 DESTINATION "${CMAKE_INSTALL_LIBDIR}/bemenu") |