Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 04:02:15 +00:00
Code Issues Releases Activity

Fix conky-cairo_imlib2_helper dependency conditions (#1874)

Browse Source 
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
This commit is contained in:
Tin Švagelj 2024-04-30 15:17:44 +00:00 committed by GitHub
parent bbc6193014
commit f3f53fd764
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/ConkyBuildOptions.cmake
View File

@ -210,10 +210,10 @@ dependent_option(BUILD_MOUSE_EVENTS "Enable mouse event support" true
"Mouse event support requires Wayland or X11 enabled") "Mouse event support requires Wayland or X11 enabled")
# Lua library options # Lua library options
dependent_option(BUILD_LUA_CAIRO "Build cairo bindings for Lua" false dependent_option(BUILD_LUA_CAIRO "Build Cairo bindings for Lua" false
"BUILD_GUI" false "BUILD_GUI" false
"Cairo Lua bindings depend on BUILD_GUI") "Cairo Lua bindings depend on BUILD_GUI")
dependent_option(BUILD_LUA_CAIRO_XLIB "Build Imlib2 bindings for Lua" true dependent_option(BUILD_LUA_CAIRO_XLIB "Build Cairo & Xlib interoperability for Lua" true
"BUILD_X11;BUILD_LUA_CAIRO" false "BUILD_X11;BUILD_LUA_CAIRO" false
"Cairo Xlib Lua bindings require Cairo and X11") "Cairo Xlib Lua bindings require Cairo and X11")
dependent_option(BUILD_LUA_IMLIB2 "Build Imlib2 bindings for Lua" false dependent_option(BUILD_LUA_IMLIB2 "Build Imlib2 bindings for Lua" false

4
lua/CMakeLists.txt
View File

@ -79,7 +79,7 @@ if(BUILD_LUA_IMLIB2)
print_target_properties(conky-imlib2) print_target_properties(conky-imlib2)
endif(BUILD_LUA_IMLIB2) endif(BUILD_LUA_IMLIB2)
if(BUILD_LUA_IMLIB2) if(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2)
include_directories(${luacairo_includes} ${luaimlib2_includes} include_directories(${luacairo_includes} ${luaimlib2_includes}
${CMAKE_CURRENT_SOURCE_DIR}) ${CMAKE_CURRENT_SOURCE_DIR})
wrap_tolua(luacairo_imlib2_helper_src cairo_imlib2_helper.pkg) wrap_tolua(luacairo_imlib2_helper_src cairo_imlib2_helper.pkg)
@ -93,7 +93,7 @@ if(BUILD_LUA_IMLIB2)
${luaimlib2_libs} ${luaimlib2_libs}
toluapp_lib_static) toluapp_lib_static)
set(lua_libs ${lua_libs} conky-cairo_imlib2_helper) set(lua_libs ${lua_libs} conky-cairo_imlib2_helper)
endif(BUILD_LUA_IMLIB2) endif(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2)
if(BUILD_LUA_RSVG) if(BUILD_LUA_RSVG)
include_directories(${luarsvg_includes} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${luarsvg_includes} ${CMAKE_CURRENT_SOURCE_DIR})