From a23426d8a40f540170844d7a9b4702387897e63f Mon Sep 17 00:00:00 2001 From: Axel Kittenberger Date: Fri, 9 Mar 2018 10:27:41 +0100 Subject: [PATCH] preparing 2.2.3 --- CMakeLists.txt | 1 + ChangeLog | 2 ++ cmake/FindLua.cmake | 18 ++++++------------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 147f190..17a5b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,3 +107,4 @@ target_link_libraries( lsyncd ${LUA_LIBRARIES} ) install( TARGETS lsyncd RUNTIME DESTINATION bin ) install( FILES doc/manpage/lsyncd.1 DESTINATION man ) + diff --git a/ChangeLog b/ChangeLog index 8d5602f..f0b8577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ a trailing '/' to it, since that would change it from homedir to rootdir! add: example for Amazon S3 Bucket (Daniel Miranda) fix: setting stdout/stderr to linebuffer mode. + 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 fix: checkgauge 'insist' diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake index 5fabb3f..71d0eb2 100644 --- a/cmake/FindLua.cmake +++ b/cmake/FindLua.cmake @@ -27,22 +27,16 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) # -# The required version of Lua can be specified using the -# standard syntax, e.g. FIND_PACKAGE(Lua 5.2) -# Otherwise the module will search for any available Lua implementation +# This module will try to find the newest Lua version down to 5.2 # Always search for non-versioned lua first (recommended) SET(_POSSIBLE_LUA_INCLUDE include include/lua) -SET(_POSSIBLE_LUA_EXECUTABLE lua) -SET(_POSSIBLE_LUA_COMPILER luac) -SET(_POSSIBLE_LUA_LIBRARY lua) +#SET(_POSSIBLE_LUA_EXECUTABLE lua) +#SET(_POSSIBLE_LUA_COMPILER luac) +#SET(_POSSIBLE_LUA_LIBRARY lua) # Determine possible naming suffixes (there is no standard for this) -IF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR) - 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(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2" "") # Set up possible search names and locations FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) @@ -59,7 +53,7 @@ FIND_PROGRAM(LUA_EXECUTABLE # Find the lua executable FIND_PROGRAM(LUA_COMPILER - NAMES ${_POSSIBLE_LUA_COMPILER} + NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER} ) # Find the lua header