From 4edba0b396e316f07b7bfcd6d2e19aa98b3a2e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tin=20=C5=A0vagelj?= Date: Sat, 16 Nov 2024 08:52:55 +0100 Subject: [PATCH] Fix X11 includes in lua modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tin Å vagelj --- cmake/ConkyPlatformChecks.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake index dc1e3d8ce..047fb4c0b 100644 --- a/cmake/ConkyPlatformChecks.cmake +++ b/cmake/ConkyPlatformChecks.cmake @@ -514,6 +514,12 @@ if(BUILD_LUA_CAIRO) set(luacairo_includes ${CAIROXLIB_INCLUDE_DIRS} ${luacairo_includes}) endif(BUILD_LUA_CAIRO_XLIB) + list(REMOVE_DUPLICATES luacairo_libs) + if("-lX11" IN_LIST luacairo_libs) + list(REMOVE_ITEM luacairo_libs "-lX11" "-lXext") + set(luacairo_libs ${X11_LIBRARIES} ${luacairo_libs}) + endif("-lX11" IN_LIST luacairo_libs) + find_program(APP_PATCH patch) if(NOT APP_PATCH)