octoleo/lsyncd
1
0
Fork 0
mirror of https://github.com/octoleo/lsyncd.git synced 2025-01-07 09:04:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing loadstring() Lua5.3 issue

Browse Source
This commit is contained in:
Axel Kittenberger 2018-03-09 10:42:40 +01:00
commit c0a31c215d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -107,3 +107,4 @@ target_link_libraries( lsyncd ${LUA_LIBRARIES} )
install( TARGETS lsyncd RUNTIME DESTINATION bin ) install( TARGETS lsyncd RUNTIME DESTINATION bin )
install( FILES doc/manpage/lsyncd.1 DESTINATION man ) install( FILES doc/manpage/lsyncd.1 DESTINATION man )

2
ChangeLog
View File

@ -7,6 +7,8 @@
fix: setting stdout/stderr to linebuffer mode. fix: setting stdout/stderr to linebuffer mode.
fix: Lua5.3 compatiblity, using load() instead of loadstring() fix: Lua5.3 compatiblity, using load() instead of loadstring()
Lua5.1 support was thus dropped Lua5.1 support was thus dropped
fix: cmake lua detection, will resort to "lua" and "luac" binaries only if
more specific suffixes (e.g. luac5.3) are not available
2017-02-16: 2.2.2 2017-02-16: 2.2.2
fix: checkgauge 'insist' fix: checkgauge 'insist'

18
cmake/FindLua.cmake
View File

@ -27,22 +27,16 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
# #
# The required version of Lua can be specified using the # This module will try to find the newest Lua version down to 5.2
# standard syntax, e.g. FIND_PACKAGE(Lua 5.2)
# Otherwise the module will search for any available Lua implementation
# Always search for non-versioned lua first (recommended) # Always search for non-versioned lua first (recommended)
SET(_POSSIBLE_LUA_INCLUDE include include/lua) SET(_POSSIBLE_LUA_INCLUDE include include/lua)
SET(_POSSIBLE_LUA_EXECUTABLE lua) #SET(_POSSIBLE_LUA_EXECUTABLE lua)
SET(_POSSIBLE_LUA_COMPILER luac) #SET(_POSSIBLE_LUA_COMPILER luac)
SET(_POSSIBLE_LUA_LIBRARY lua) #SET(_POSSIBLE_LUA_LIBRARY lua)
# Determine possible naming suffixes (there is no standard for this) # Determine possible naming suffixes (there is no standard for this)
IF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR) SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2" "")
SET(_POSSIBLE_SUFFIXES "${Lua_FIND_VERSION_MAJOR}${Lua_FIND_VERSION_MINOR}" "${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}" "-${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}")
ELSE(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2")
ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
# Set up possible search names and locations # Set up possible search names and locations
FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES})
@ -59,7 +53,7 @@ FIND_PROGRAM(LUA_EXECUTABLE
# Find the lua executable # Find the lua executable
FIND_PROGRAM(LUA_COMPILER FIND_PROGRAM(LUA_COMPILER
NAMES ${_POSSIBLE_LUA_COMPILER} NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER}
) )
# Find the lua header # Find the lua header