From 2a1afbbbbab23bd4f2757b8ead6f0db2be21555c Mon Sep 17 00:00:00 2001 From: James Morris Date: Tue, 15 Jan 2013 00:02:25 +0000 Subject: [PATCH] fix lua/cairo/imlib2 linkage issues --- lua/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index af2897c9..20dcaeaf 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -34,20 +34,22 @@ if(BUILD_LUA_CAIRO) # if you have a better solution, please let me know 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}) - set(lua_libs ${lua_libs} cairo) + target_link_libraries(conky-cairo ${luacairo_libs} ${TOLUA_LIBS}) + set(lua_libs ${lua_libs} conky-cairo) endif(BUILD_LUA_CAIRO) if(BUILD_LUA_IMLIB2) include_directories(${luaimlib2_includes} ${CMAKE_CURRENT_SOURCE_DIR}) 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}) - set(lua_libs ${lua_libs} imlib2) + target_link_libraries(conky-imlib2 ${luaimlib2_libs} ${TOLUA_LIBS}) + set(lua_libs ${lua_libs} conky-imlib2) endif(BUILD_LUA_IMLIB2) install(TARGETS