From 5aa14ef2279bb9d09d55f93e69c6fbd7d31e4b82 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 26 Feb 2021 13:40:22 +0000 Subject: [PATCH] [Minor] Check for Lua 5.4 Issue: #3656 --- CMakeLists.txt | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a218e28fd..4b4538dd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,27 +157,40 @@ ELSE(ENABLE_LUAJIT MATCHES "ON") IF (NOT WITH_LIBLUA) ProcessPackage(LIBLUA LIBRARY "lua" - "lua-5.2" - LIB_SUFFIXES "lua5.2" + "lua-5.4" + LIB_SUFFIXES "lua5.4" INCLUDE lua.h INCLUDE_SUFFIXES - "include/lua-5.2" - "include/lua5.2" - "include/lua52" + "include/lua-5.4" + "include/lua5.4" + "include/lua54" "include/lua" ROOT ${LUA_ROOT} - MODULES lua52 + MODULES lua54 OPTIONAL) - IF (NOT WITH_LIBLUA) ProcessPackage(LIBLUA LIBRARY "lua" - "lua-5.1" + "lua-5.2" + LIB_SUFFIXES "lua5.2" INCLUDE lua.h INCLUDE_SUFFIXES - "include/lua-5.1" - "include/lua5.1" - "include/lua51" + "include/lua-5.2" + "include/lua5.2" + "include/lua52" "include/lua" ROOT ${LUA_ROOT} - MODULES lua51) + MODULES lua52 + OPTIONAL) + + IF (NOT WITH_LIBLUA) + ProcessPackage(LIBLUA LIBRARY "lua" + "lua-5.1" + INCLUDE lua.h INCLUDE_SUFFIXES + "include/lua-5.1" + "include/lua5.1" + "include/lua51" + "include/lua" + ROOT ${LUA_ROOT} + MODULES lua51) + ENDIF() ENDIF() ENDIF() ENDIF(ENABLE_LUAJIT MATCHES "ON") -- 2.39.5