Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00
Code Issues Releases Activity

Search for luajit module (#528)

Browse Source
This commit is contained in:
Ranieri Althoff 2018-06-26 23:20:26 +00:00 committed by Brenden Matthews
parent 79321355f5
commit bf10130cae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/ConkyPlatformChecks.cmake
View File

@ -319,13 +319,13 @@ endif(BUILD_LUA_CAIRO OR BUILD_LUA_IMLIB2 OR BUILD_LUA_RSVG)
# Check for Lua itself # Check for Lua itself
if(WANT_TOLUA) if(WANT_TOLUA)
# If we need tolua++, we must compile against Lua 5.1 # If we need tolua++, we must compile against Lua 5.1
pkg_search_module(LUA REQUIRED lua5.1 lua-5.1 lua51 lua) pkg_search_module(LUA REQUIRED lua5.1 lua-5.1 lua51 lua luajit)
if(NOT LUA_VERSION VERSION_LESS 5.2.0) if(NOT LUA_VERSION VERSION_LESS 5.2.0)
message(FATAL_ERROR "Unable to find Lua 5.1.x") message(FATAL_ERROR "Unable to find Lua 5.1.x")
endif(NOT LUA_VERSION VERSION_LESS 5.2.0) endif(NOT LUA_VERSION VERSION_LESS 5.2.0)
else(WANT_TOLUA) else(WANT_TOLUA)
# Otherwise, use the most recent Lua version # Otherwise, use the most recent Lua version
pkg_search_module(LUA REQUIRED lua>=5.3 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua>=5.1) pkg_search_module(LUA REQUIRED lua>=5.3 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua>=5.1 luajit)
endif(WANT_TOLUA) endif(WANT_TOLUA)
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})