diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-09-06 16:18:09 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-07 04:02:36 +0000 |
| commit | d703310749312b0b822af0cb5ab3947dc5a53696 (patch) | |
| tree | 125225986ad7be61d797136df3586f25a9045101 /cmake/modules | |
| parent | 46e71f9a7c17e6aec5dd9d7c5829ac8bc684d90e (diff) | |
cmake: optionally require Lua 5.1 or newer
doc/README.wslua reports support for 5.1 and 5.2 only. Even RHEL6 ships
with Lua 5.1, so it makes not sense to maintain support for Lua 5.0.
Change-Id: I34a8084c7fba19d631b90ce5d5a28198be6a7850
Reviewed-on: https://code.wireshark.org/review/29448
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindLUA.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/modules/FindLUA.cmake b/cmake/modules/FindLUA.cmake index 9cc61d0606..2fc589f417 100644 --- a/cmake/modules/FindLUA.cmake +++ b/cmake/modules/FindLUA.cmake @@ -19,7 +19,7 @@ FindWSWinLibs("lua5*" "LUA_HINTS") if(NOT WIN32) find_package(PkgConfig) - pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50) + pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51) if(NOT LUA_FOUND) pkg_search_module(LUA "lua<=5.2.99") endif() @@ -47,8 +47,6 @@ if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h") if (LUA_VERSION_NUM) string(REGEX REPLACE "^#define[ \t]+LUA_VERSION_NUM[ \t]+([0-9]+)" "\\1" LUA_VERSION_NUM "${LUA_VERSION_NUM}") - else() - set( LUA_VERSION_NUM "500") endif() endif() string( REGEX REPLACE ".*[/\\]lua(.+)$" "\\1" LUA_INC_SUFFIX "${LUA_INCLUDE_DIR}" ) @@ -74,7 +72,7 @@ FIND_LIBRARY(LUA_LIBRARY /opt ) -# Lua 5.3 is not supported, only 5.0/5.1/5.2 are (due to bitops problem) +# Lua 5.3 is not supported, only 5.1/5.2 are (due to bitops problem) if(LUA_VERSION_NUM GREATER 502) set(LUA_VERSION_NUM) endif() |