diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cmake/modules/FindLua.cmake | 14 | ||||
| -rw-r--r-- | docbook/release-notes.adoc | 4 |
3 files changed, 9 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e061912205..0aab390b32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1364,8 +1364,7 @@ if(FETCH_lua) # Download and build lua include(${CMAKE_SOURCE_DIR}/cmake/external/lua52/Lua52.cmake) else() - set(LUA_FIND_VERSIONS 5.2 CACHE STRING "Valid Lua versions") - set_property(CACHE LUA_FIND_VERSIONS PROPERTY STRINGS 5.2 5.1 ANY) + set(LUA_FIND_VERSIONS "5.2;5.1" CACHE STRING "Lua versions valid for the build (as a list)") ws_find_package(Lua ENABLE_LUA HAVE_LUA) endif() @@ -1967,6 +1966,11 @@ set_package_properties(Sinsp PROPERTIES URL "https://github.com/falcosecurity/libs/" PURPOSE "Support for Falco plugins" ) +set_package_properties(Lua PROPERTIES + DESCRIPTION "Lua is a powerful, efficient, lightweight, embeddable scripting language" + URL "https://www.lua.org/" + PURPOSE "Lua allows writing dissectors and other extensions without a C/C++ compiler" +) string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type) message(STATUS "C-Flags: ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${_build_type}}") diff --git a/cmake/modules/FindLua.cmake b/cmake/modules/FindLua.cmake index 7e835843c2..23e50a6a94 100644 --- a/cmake/modules/FindLua.cmake +++ b/cmake/modules/FindLua.cmake @@ -55,18 +55,10 @@ unset(_lua_append_versions) # this is a function only to have all the variables inside go away automatically function(_lua_get_versions) - if (LUA_FIND_VERSIONS STREQUAL 5.2) - set(LUA_VERSIONS5 5.2) - elseif(LUA_FIND_VERSIONS STREQUAL 5.1) - set(LUA_VERSIONS5 5.1) - else() - set(LUA_VERSIONS5 5.2 5.1) - endif() + set(LUA_VERSIONS5 ${LUA_FIND_VERSIONS}) + list(FILTER LUA_VERSIONS5 INCLUDE REGEX "5\.[21]") set(_lua_append_versions ${LUA_VERSIONS5}) - - if (LUA_Debug) - message(STATUS "Considering following Lua versions: ${_lua_append_versions}") - endif() + message(STATUS "Considering the following Lua versions: ${_lua_append_versions}") set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE) endfunction() diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc index 37a331dbb0..27c7d37b15 100644 --- a/docbook/release-notes.adoc +++ b/docbook/release-notes.adoc @@ -167,10 +167,6 @@ can be achieved via other fields, prefer that. * The Lua console dialogs under Tools were refactored and redesigned. It now consists of a single dialog window for input and output. -* By default CMake now searches only for Lua 5.2. You may explicictly choose - to fallback to Lua 5.1 (not recommended) by setting the CMake configuration - variable `LUA_FIND_VERSIONS=5.1`. - * Wireshark now shows byte units in the statistics in the user-selected language (uses the system default language by default). |