1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-10-02 23:19:08 +00:00

fix lua/cairo/imlib2 linkage issues

This commit is contained in:
James Morris 2013-01-15 00:02:25 +00:00
parent 710646c101
commit 2a1afbbbba

View File

@ -34,20 +34,22 @@ if(BUILD_LUA_CAIRO)
# if you have a better solution, please let me know # if you have a better solution, please let me know
wrap_tolua(luacairo_src cairo.pkg libcairo.patch) wrap_tolua(luacairo_src cairo.pkg libcairo.patch)
add_library(cairo SHARED ${luacairo_src}) add_library(conky-cairo SHARED ${luacairo_src})
set_target_properties(conky-cairo PROPERTIES OUTPUT_NAME "cairo")
target_link_libraries(cairo ${luacairo_libs} ${TOLUA_LIBS}) target_link_libraries(conky-cairo ${luacairo_libs} ${TOLUA_LIBS})
set(lua_libs ${lua_libs} cairo) set(lua_libs ${lua_libs} conky-cairo)
endif(BUILD_LUA_CAIRO) endif(BUILD_LUA_CAIRO)
if(BUILD_LUA_IMLIB2) if(BUILD_LUA_IMLIB2)
include_directories(${luaimlib2_includes} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${luaimlib2_includes} ${CMAKE_CURRENT_SOURCE_DIR})
wrap_tolua(luaimlib2_src imlib2.pkg) wrap_tolua(luaimlib2_src imlib2.pkg)
add_library(imlib2 SHARED ${luaimlib2_src}) add_library(conky-imlib2 SHARED ${luaimlib2_src})
set_target_properties(conky-imlib2 PROPERTIES OUTPUT_NAME "imlib2")
target_link_libraries(imlib2 ${luaimlib2_libs} ${TOLUA_LIBS}) target_link_libraries(conky-imlib2 ${luaimlib2_libs} ${TOLUA_LIBS})
set(lua_libs ${lua_libs} imlib2) set(lua_libs ${lua_libs} conky-imlib2)
endif(BUILD_LUA_IMLIB2) endif(BUILD_LUA_IMLIB2)
install(TARGETS install(TARGETS