Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 04:55:08 +00:00
Code Issues Releases Activity

Merge pull request #4 from jwm-art-net/master

Browse Source 
fix for where simultaneous installs of lua 5.1 & 5.2 exist
This commit is contained in:
labath 2013-01-15 12:51:23 -08:00
commit 2688875cbc
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitignore vendored
View File

@ -6,3 +6,16 @@ doc/conky.1
README README
build* build*
doc/*.html doc/*.html
Makefile
CMakeCache.txt
CMakeFiles
*.cmake
data/convertconf.h
data/defconfig.h
lua/libcairo-orig.c
lua/libcairo.c
lua/libimlib2.c
*.so
*.a
/config.h

2
cmake/ConkyPlatformChecks.cmake
View File

@ -233,7 +233,7 @@ if(BUILD_X11)
endif(X11_FOUND) endif(X11_FOUND)
endif(BUILD_X11) endif(BUILD_X11)
pkg_search_module(LUA REQUIRED lua>=5.1 lua-5.1>=5.1 lua5.1>=5.1) pkg_search_module(LUA REQUIRED lua5.1 lua-5.1 lua=5.1)
set(conky_libs ${conky_libs} ${LUA_LIBRARIES}) set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS}) set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS})
if(BUILD_LUA_CAIRO) if(BUILD_LUA_CAIRO)

14
lua/CMakeLists.txt
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