summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kortkamp <t@tobik.me>2019-04-23 12:17:16 +0200
committerTobias Kortkamp <t@tobik.me>2019-04-23 12:17:16 +0200
commit620ae690209a36b680524f4a4d8bec2f464f05fa (patch)
tree7c89af37018877af331042d6e82f0e84dbd9ac42
parent2ca0625a70245e8a0aa1cda2be7c367c4fd62949 (diff)
downloadbemenu-620ae690209a36b680524f4a4d8bec2f464f05fa.tar.gz
bemenu-620ae690209a36b680524f4a4d8bec2f464f05fa.tar.bz2
bemenu-620ae690209a36b680524f4a4d8bec2f464f05fa.zip
Use x_LINK_LIBRARIES instead of x_LIBRARIES
The libraries might not be in the linkers default search path, so use absolute paths for them instead when using TARGET_LINK_LIBRARIES. Note that XKBCOMMON_LIBRARIES is an alias for XKBCOMMON_LIBRARY and already contains an absolute path. Signed-off-by: Tobias Kortkamp <t@tobik.me>
-rw-r--r--lib/renderers/wayland/CMakeLists.txt2
-rw-r--r--lib/renderers/x11/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/renderers/wayland/CMakeLists.txt b/lib/renderers/wayland/CMakeLists.txt
index e4c473e..dbe56c8 100644
--- a/lib/renderers/wayland/CMakeLists.txt
+++ b/lib/renderers/wayland/CMakeLists.txt
@@ -13,5 +13,5 @@ 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} ${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} ${EPOLL_SHIM_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/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")