From 12262322c4a35af6ff807f3353a06188620569bc Mon Sep 17 00:00:00 2001 From: Aire-One Date: Sat, 22 Jan 2022 16:09:10 +0100 Subject: [PATCH] chore: Allow Lua 5.4 to build and run Co-authored-by: Emmanuel Lepage Vallee --- awesomeConfig.cmake | 6 +++--- luaa.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index 5f292aaa0..592c2b252 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -73,9 +73,9 @@ if (NOT LUA_FOUND) endif() set(LUA_FULL_VERSION "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}") -# 5.1 <= LUA_VERSION < 5.4 -if(NOT ((LUA_FULL_VERSION VERSION_EQUAL 5.1.0 OR LUA_FULL_VERSION VERSION_GREATER 5.1.0) AND LUA_FULL_VERSION VERSION_LESS 5.4.0)) - message(FATAL_ERROR "Awesome only supports Lua versions 5.1-5.3, please refer to" +# 5.1 <= LUA_VERSION < 5.5 +if(NOT ((LUA_FULL_VERSION VERSION_EQUAL 5.1.0 OR LUA_FULL_VERSION VERSION_GREATER 5.1.0) AND LUA_FULL_VERSION VERSION_LESS 5.5.0)) + message(FATAL_ERROR "Awesome only supports Lua versions 5.1-5.4, please refer to" "https://awesomewm.org/apidoc/documentation/10-building-and-testing.md.html#Building") endif() diff --git a/luaa.h b/luaa.h index fae072702..04e283422 100644 --- a/luaa.h +++ b/luaa.h @@ -31,8 +31,8 @@ #include "common/lualib.h" #include "common/luaclass.h" -#if !(501 <= LUA_VERSION_NUM && LUA_VERSION_NUM < 504) -#error "Awesome only supports Lua versions 5.1-5.3 and LuaJIT2, please refer to https://awesomewm.org/apidoc/documentation/10-building-and-testing.md.html#Building" +#if !(501 <= LUA_VERSION_NUM && LUA_VERSION_NUM < 505) +#error "Awesome only supports Lua versions 5.1-5.4 and LuaJIT2, please refer to https://awesomewm.org/apidoc/documentation/10-building-and-testing.md.html#Building" #endif #define luaA_deprecate(L, repl) \