diff options
Diffstat (limited to 'cmake/external')
| -rw-r--r-- | cmake/external/lua54/0001-Add-an-install-static-target.patch (renamed from cmake/external/lua52/0001-Add-an-install-static-target.patch) | 0 | ||||
| -rw-r--r-- | cmake/external/lua54/Lua54.cmake (renamed from cmake/external/lua52/Lua52.cmake) | 16 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cmake/external/lua52/0001-Add-an-install-static-target.patch b/cmake/external/lua54/0001-Add-an-install-static-target.patch index 0f161925..0f161925 100644 --- a/cmake/external/lua52/0001-Add-an-install-static-target.patch +++ b/cmake/external/lua54/0001-Add-an-install-static-target.patch diff --git a/cmake/external/lua52/Lua52.cmake b/cmake/external/lua54/Lua54.cmake index 864f2235..53f23b8e 100644 --- a/cmake/external/lua52/Lua52.cmake +++ b/cmake/external/lua54/Lua54.cmake @@ -23,10 +23,12 @@ set(LUA_INCLUDE_DIRS "${_staging_dir}/include") set(LUA_LIBRARIES "${_staging_dir}/lib/liblua.a") set(LUA_FOUND TRUE CACHE INTERNAL "") set(Lua_FOUND TRUE CACHE INTERNAL "") +# Fresh Lua 5.3+ install always has 64-bit lua_Integers (unlike Lua 5.2) +set(LUA_INTEGER_SIZE 8 CACHE INTERNAL "Size of lua_Integer") -set(_lua52_cflags "-fPIC") +set(_lua54_cflags "-fPIC") if(APPLE) - set(_lua52_cflags "${lua52_cflags} -isysroot ${CMAKE_OSX_SYSROOT}") + set(_lua54_cflags "${lua54_cflags} -isysroot ${CMAKE_OSX_SYSROOT}") endif() # @@ -34,13 +36,13 @@ endif() # external projects to a staging directory first, and the normal install target # does not work with MinGW. # -ExternalProject_Add(lua52 - URL https://gitlab.com/wireshark/wireshark-development-libraries/-/raw/main/public/src/lua/lua-5.2.4.tar.gz - URL https://www.lua.org/ftp/lua-5.2.4.tar.gz - URL_HASH SHA256=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b +ExternalProject_Add(lua54 + URL https://gitlab.com/wireshark/wireshark-development-libraries/-/raw/main/public/src/lua/lua-5.4.6.tar.gz + URL https://www.lua.org/ftp/lua-5.4.6.tar.gz + URL_HASH SHA256=7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/0001-Add-an-install-static-target.patch CONFIGURE_COMMAND "" - BUILD_COMMAND ${MAKE_EXE} MYCFLAGS=${_lua52_cflags} CC=${CMAKE_C_COMPILER} AR=${CMAKE_AR}\ rcu RANLIB=${CMAKE_RANLIB} ${_target} + BUILD_COMMAND ${MAKE_EXE} MYCFLAGS=${_lua54_cflags} CC=${CMAKE_C_COMPILER} AR=${CMAKE_AR}\ rcu RANLIB=${CMAKE_RANLIB} ${_target} BUILD_IN_SOURCE True BUILD_BYPRODUCTS ${LUA_LIBRARIES} INSTALL_COMMAND ${MAKE_EXE} INSTALL_TOP=${_staging_dir} install-static |