diff options
Diffstat (limited to 'FindLua.cmake.patch')
| -rw-r--r-- | FindLua.cmake.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/FindLua.cmake.patch b/FindLua.cmake.patch new file mode 100644 index 000000000000..90fc58d03550 --- /dev/null +++ b/FindLua.cmake.patch @@ -0,0 +1,54 @@ +--- lsyncd-release-2.1.6/cmake/FindLua.cmake 2015-10-15 08:29:47.000000000 +0200 ++++ ../lsyncd-release-2.1.6/cmake/FindLua.cmake 2016-02-11 12:57:45.838387588 +0100 +@@ -32,21 +32,23 @@ + # Otherwise the module will search for any available Lua implementation + + # Always search for non-versioned lua first (recommended) +-SET(_POSSIBLE_LUA_INCLUDE include include/lua) +-SET(_POSSIBLE_LUA_EXECUTABLE lua) +-SET(_POSSIBLE_LUA_LIBRARY lua) ++SET(_POSSIBLE_LUA_INCLUDE) ++SET(_POSSIBLE_LUA_EXECUTABLE) ++SET(_POSSIBLE_LUA_COMPILER) ++SET(_POSSIBLE_LUA_LIBRARY) + + # 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 "52" "5.2" "-5.2" "51" "5.1" "-5.1") ++ SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2") + ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR) + + # Set up possible search names and locations + FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) + LIST(APPEND _POSSIBLE_LUA_INCLUDE "include/lua${_SUFFIX}") + LIST(APPEND _POSSIBLE_LUA_EXECUTABLE "lua${_SUFFIX}") ++ LIST(APPEND _POSSIBLE_LUA_COMPILER "luac${_SUFFIX}") + LIST(APPEND _POSSIBLE_LUA_LIBRARY "lua${_SUFFIX}") + ENDFOREACH(_SUFFIX) + +@@ -55,11 +57,16 @@ + NAMES ${_POSSIBLE_LUA_EXECUTABLE} + ) + ++FIND_PROGRAM(LUA_COMPILER ++ NAMES ${_POSSIBLE_LUA_COMPILER} ++) ++ + # Find the lua header + FIND_PATH(LUA_INCLUDE_DIR lua.h + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES ${_POSSIBLE_LUA_INCLUDE} ++ NO_DEFAULT_PATH + PATHS + ~/Library/Frameworks + /Library/Frameworks +@@ -114,5 +121,5 @@ + REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR + VERSION_VAR LUA_VERSION_STRING) + +-MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY LUA_EXECUTABLE) ++MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY LUA_EXECUTABLE LUA_COMPLIER) + |