Auto update
This commit is contained in:
parent
ad26ce66b3
commit
818e00e1f6
104 changed files with 15065 additions and 13333 deletions
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
#define LUA_VERSION_MAJOR "5"
|
||||
#define LUA_VERSION_MINOR "4"
|
||||
#define LUA_VERSION_RELEASE "4"
|
||||
#define LUA_VERSION_RELEASE "6"
|
||||
|
||||
#define LUA_VERSION_NUM 504
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 4)
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6)
|
||||
|
||||
#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
|
||||
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2022 Lua.org, PUC-Rio"
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio"
|
||||
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
|
||||
|
||||
|
||||
|
|
@ -131,6 +131,16 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
|
|||
typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
|
||||
|
||||
|
||||
/*
|
||||
** Type used by the debug API to collect debug information
|
||||
*/
|
||||
typedef struct lua_Debug lua_Debug;
|
||||
|
||||
|
||||
/*
|
||||
** Functions to be called by the debugger in specific events
|
||||
*/
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -153,7 +163,8 @@ extern const char lua_ident[];
|
|||
LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
|
||||
LUA_API void (lua_close) (lua_State *L);
|
||||
LUA_API lua_State *(lua_newthread) (lua_State *L);
|
||||
LUA_API int (lua_resetthread) (lua_State *L);
|
||||
LUA_API int (lua_closethread) (lua_State *L, lua_State *from);
|
||||
LUA_API int (lua_resetthread) (lua_State *L); /* Deprecated! */
|
||||
|
||||
LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
|
||||
|
||||
|
|
@ -442,12 +453,6 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx);
|
|||
#define LUA_MASKLINE (1 << LUA_HOOKLINE)
|
||||
#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT)
|
||||
|
||||
typedef struct lua_Debug lua_Debug; /* activation record */
|
||||
|
||||
|
||||
/* Functions to be called by the debugger in specific events */
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
|
||||
LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
|
||||
|
|
@ -492,7 +497,7 @@ struct lua_Debug {
|
|||
|
||||
|
||||
/******************************************************************************
|
||||
* Copyright (C) 1994-2022 Lua.org, PUC-Rio.
|
||||
* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
|
|
|
|||
|
|
@ -70,6 +70,12 @@
|
|||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_IOS)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
|
||||
*/
|
||||
|
|
@ -728,7 +734,7 @@
|
|||
** CHANGE it if you need a different limit. This limit is arbitrary;
|
||||
** its only purpose is to stop Lua from consuming unlimited stack
|
||||
** space (and to reserve some numbers for pseudo-indices).
|
||||
** (It must fit into max(size_t)/32.)
|
||||
** (It must fit into max(size_t)/32 and max(int)/2.)
|
||||
*/
|
||||
#if LUAI_IS32INT
|
||||
#define LUAI_MAXSTACK 1000000
|
||||
|
|
@ -747,14 +753,15 @@
|
|||
|
||||
/*
|
||||
@@ LUA_IDSIZE gives the maximum size for the description of the source
|
||||
@@ of a function in debug information.
|
||||
** of a function in debug information.
|
||||
** CHANGE it if you want a different size.
|
||||
*/
|
||||
#define LUA_IDSIZE 60
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
||||
@@ LUAL_BUFFERSIZE is the initial buffer size used by the lauxlib
|
||||
** buffer system.
|
||||
*/
|
||||
#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number)))
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
|||
####### Any changes to this file will be overwritten by the next CMake run ####
|
||||
####### The input file was LuaConfig.cmake.in ########
|
||||
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
|
||||
|
||||
macro(set_and_check _var _file)
|
||||
set(${_var} "${_file}")
|
||||
|
|
@ -27,8 +27,21 @@ endmacro()
|
|||
include("${CMAKE_CURRENT_LIST_DIR}/LuaTargets.cmake")
|
||||
|
||||
set_and_check(LUA_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")
|
||||
set_and_check(LUA_LIBRARY "${PACKAGE_PREFIX_DIR}/lib/liblua.a")
|
||||
add_library(Lua::Library ALIAS "Lua::lua_static")
|
||||
get_target_property(LUA_CONFIG "Lua::lua_static" IMPORTED_CONFIGURATIONS)
|
||||
get_target_property(LUA_LIBRARY "Lua::lua_static" "IMPORTED_LOCATION_${LUA_CONFIG}")
|
||||
set(LUA_LIBRARIES "${LUA_LIBRARY}")
|
||||
add_library(Lua::Library ALIAS lua_static)
|
||||
add_library(LUA_INCLUDE_LIB INTERFACE)
|
||||
target_include_directories(LUA_INCLUDE_LIB INTERFACE "${LUA_INCLUDE_DIR}")
|
||||
list(APPEND LUA_LIBRARIES LUA_INCLUDE_LIB)
|
||||
|
||||
foreach(LIB_NAME m;dl)
|
||||
find_library(LIB_LOCATION "${LIB_NAME}")
|
||||
if(NOT LIB_LOCATION)
|
||||
message(FATAL_ERROR "lib${LIB_NAME} not found and is required by lua")
|
||||
else()
|
||||
list(APPEND LUA_LIBRARIES "${LIB_LOCATION}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
check_required_components(Lua)
|
||||
|
|
@ -9,19 +9,19 @@
|
|||
# The variable CVF_VERSION must be set before calling configure_file().
|
||||
|
||||
|
||||
set(PACKAGE_VERSION "5.4.4")
|
||||
set(PACKAGE_VERSION "5.4.6")
|
||||
|
||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
||||
if("5.4.4" MATCHES "^([0-9]+)\\.")
|
||||
if("5.4.6" MATCHES "^([0-9]+)\\.")
|
||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||
endif()
|
||||
else()
|
||||
set(CVF_VERSION_MAJOR "5.4.4")
|
||||
set(CVF_VERSION_MAJOR "5.4.6")
|
||||
endif()
|
||||
|
||||
if(PACKAGE_FIND_VERSION_RANGE)
|
||||
|
|
@ -5,15 +5,15 @@
|
|||
# Commands may need to know the format version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||
|
||||
# Import target "lua_static" for configuration "Release"
|
||||
set_property(TARGET lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
# Import target "Lua::lua_static" for configuration "Release"
|
||||
set_property(TARGET Lua::lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua.a"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua_static.a"
|
||||
)
|
||||
|
||||
list(APPEND _IMPORT_CHECK_TARGETS lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_lua_static "${_IMPORT_PREFIX}/lib/liblua.a" )
|
||||
list(APPEND _IMPORT_CHECK_TARGETS Lua::lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_Lua::lua_static "${_IMPORT_PREFIX}/lib/liblua_static.a" )
|
||||
|
||||
# Commands beyond this point should not need to know the version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION)
|
||||
|
|
@ -16,7 +16,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
|||
set(_targetsDefined)
|
||||
set(_targetsNotDefined)
|
||||
set(_expectedTargets)
|
||||
foreach(_expectedTarget lua_static)
|
||||
foreach(_expectedTarget Lua::lua_internal Lua::lua_include Lua::lua_static)
|
||||
list(APPEND _expectedTargets ${_expectedTarget})
|
||||
if(NOT TARGET ${_expectedTarget})
|
||||
list(APPEND _targetsNotDefined ${_expectedTarget})
|
||||
|
|
@ -45,21 +45,36 @@ unset(_expectedTargets)
|
|||
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
if(_IMPORT_PREFIX STREQUAL "/")
|
||||
set(_IMPORT_PREFIX "")
|
||||
endif()
|
||||
|
||||
# Create imported target lua_static
|
||||
add_library(lua_static STATIC IMPORTED)
|
||||
# Create imported target Lua::lua_internal
|
||||
add_library(Lua::lua_internal INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
INTERFACE_LINK_LIBRARIES "m;dl"
|
||||
set_target_properties(Lua::lua_internal PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX;LUA_USE_DLOPEN"
|
||||
INTERFACE_COMPILE_OPTIONS "-Wall;-Wextra"
|
||||
INTERFACE_LINK_LIBRARIES "Lua::lua_include;m;dl"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
|
||||
# Create imported target Lua::lua_include
|
||||
add_library(Lua::lua_include INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_include PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
)
|
||||
|
||||
# Create imported target Lua::lua_static
|
||||
add_library(Lua::lua_static STATIC IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Lua::lua_internal>;Lua::lua_include"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
|
||||
endif()
|
||||
|
||||
# Load information for each installed configuration.
|
||||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
#define LUA_VERSION_MAJOR "5"
|
||||
#define LUA_VERSION_MINOR "4"
|
||||
#define LUA_VERSION_RELEASE "4"
|
||||
#define LUA_VERSION_RELEASE "6"
|
||||
|
||||
#define LUA_VERSION_NUM 504
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 4)
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6)
|
||||
|
||||
#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
|
||||
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2022 Lua.org, PUC-Rio"
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio"
|
||||
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
|
||||
|
||||
|
||||
|
|
@ -131,6 +131,16 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
|
|||
typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
|
||||
|
||||
|
||||
/*
|
||||
** Type used by the debug API to collect debug information
|
||||
*/
|
||||
typedef struct lua_Debug lua_Debug;
|
||||
|
||||
|
||||
/*
|
||||
** Functions to be called by the debugger in specific events
|
||||
*/
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -153,7 +163,8 @@ extern const char lua_ident[];
|
|||
LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
|
||||
LUA_API void (lua_close) (lua_State *L);
|
||||
LUA_API lua_State *(lua_newthread) (lua_State *L);
|
||||
LUA_API int (lua_resetthread) (lua_State *L);
|
||||
LUA_API int (lua_closethread) (lua_State *L, lua_State *from);
|
||||
LUA_API int (lua_resetthread) (lua_State *L); /* Deprecated! */
|
||||
|
||||
LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
|
||||
|
||||
|
|
@ -442,12 +453,6 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx);
|
|||
#define LUA_MASKLINE (1 << LUA_HOOKLINE)
|
||||
#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT)
|
||||
|
||||
typedef struct lua_Debug lua_Debug; /* activation record */
|
||||
|
||||
|
||||
/* Functions to be called by the debugger in specific events */
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
|
||||
LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
|
||||
|
|
@ -492,7 +497,7 @@ struct lua_Debug {
|
|||
|
||||
|
||||
/******************************************************************************
|
||||
* Copyright (C) 1994-2022 Lua.org, PUC-Rio.
|
||||
* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
|
|
|
|||
|
|
@ -70,6 +70,12 @@
|
|||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_IOS)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
|
||||
*/
|
||||
|
|
@ -728,7 +734,7 @@
|
|||
** CHANGE it if you need a different limit. This limit is arbitrary;
|
||||
** its only purpose is to stop Lua from consuming unlimited stack
|
||||
** space (and to reserve some numbers for pseudo-indices).
|
||||
** (It must fit into max(size_t)/32.)
|
||||
** (It must fit into max(size_t)/32 and max(int)/2.)
|
||||
*/
|
||||
#if LUAI_IS32INT
|
||||
#define LUAI_MAXSTACK 1000000
|
||||
|
|
@ -747,14 +753,15 @@
|
|||
|
||||
/*
|
||||
@@ LUA_IDSIZE gives the maximum size for the description of the source
|
||||
@@ of a function in debug information.
|
||||
** of a function in debug information.
|
||||
** CHANGE it if you want a different size.
|
||||
*/
|
||||
#define LUA_IDSIZE 60
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
||||
@@ LUAL_BUFFERSIZE is the initial buffer size used by the lauxlib
|
||||
** buffer system.
|
||||
*/
|
||||
#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number)))
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
|||
####### Any changes to this file will be overwritten by the next CMake run ####
|
||||
####### The input file was LuaConfig.cmake.in ########
|
||||
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
|
||||
|
||||
macro(set_and_check _var _file)
|
||||
set(${_var} "${_file}")
|
||||
|
|
@ -27,8 +27,21 @@ endmacro()
|
|||
include("${CMAKE_CURRENT_LIST_DIR}/LuaTargets.cmake")
|
||||
|
||||
set_and_check(LUA_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")
|
||||
set_and_check(LUA_LIBRARY "${PACKAGE_PREFIX_DIR}/lib/liblua.a")
|
||||
add_library(Lua::Library ALIAS "Lua::lua_static")
|
||||
get_target_property(LUA_CONFIG "Lua::lua_static" IMPORTED_CONFIGURATIONS)
|
||||
get_target_property(LUA_LIBRARY "Lua::lua_static" "IMPORTED_LOCATION_${LUA_CONFIG}")
|
||||
set(LUA_LIBRARIES "${LUA_LIBRARY}")
|
||||
add_library(Lua::Library ALIAS lua_static)
|
||||
add_library(LUA_INCLUDE_LIB INTERFACE)
|
||||
target_include_directories(LUA_INCLUDE_LIB INTERFACE "${LUA_INCLUDE_DIR}")
|
||||
list(APPEND LUA_LIBRARIES LUA_INCLUDE_LIB)
|
||||
|
||||
foreach(LIB_NAME m;dl)
|
||||
find_library(LIB_LOCATION "${LIB_NAME}")
|
||||
if(NOT LIB_LOCATION)
|
||||
message(FATAL_ERROR "lib${LIB_NAME} not found and is required by lua")
|
||||
else()
|
||||
list(APPEND LUA_LIBRARIES "${LIB_LOCATION}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
check_required_components(Lua)
|
||||
|
|
@ -9,19 +9,19 @@
|
|||
# The variable CVF_VERSION must be set before calling configure_file().
|
||||
|
||||
|
||||
set(PACKAGE_VERSION "5.4.4")
|
||||
set(PACKAGE_VERSION "5.4.6")
|
||||
|
||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
||||
if("5.4.4" MATCHES "^([0-9]+)\\.")
|
||||
if("5.4.6" MATCHES "^([0-9]+)\\.")
|
||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||
endif()
|
||||
else()
|
||||
set(CVF_VERSION_MAJOR "5.4.4")
|
||||
set(CVF_VERSION_MAJOR "5.4.6")
|
||||
endif()
|
||||
|
||||
if(PACKAGE_FIND_VERSION_RANGE)
|
||||
|
|
@ -5,15 +5,15 @@
|
|||
# Commands may need to know the format version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||
|
||||
# Import target "lua_static" for configuration "Release"
|
||||
set_property(TARGET lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
# Import target "Lua::lua_static" for configuration "Release"
|
||||
set_property(TARGET Lua::lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua.a"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua_static.a"
|
||||
)
|
||||
|
||||
list(APPEND _IMPORT_CHECK_TARGETS lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_lua_static "${_IMPORT_PREFIX}/lib/liblua.a" )
|
||||
list(APPEND _IMPORT_CHECK_TARGETS Lua::lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_Lua::lua_static "${_IMPORT_PREFIX}/lib/liblua_static.a" )
|
||||
|
||||
# Commands beyond this point should not need to know the version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION)
|
||||
|
|
@ -16,7 +16,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
|||
set(_targetsDefined)
|
||||
set(_targetsNotDefined)
|
||||
set(_expectedTargets)
|
||||
foreach(_expectedTarget lua_static)
|
||||
foreach(_expectedTarget Lua::lua_internal Lua::lua_include Lua::lua_static)
|
||||
list(APPEND _expectedTargets ${_expectedTarget})
|
||||
if(NOT TARGET ${_expectedTarget})
|
||||
list(APPEND _targetsNotDefined ${_expectedTarget})
|
||||
|
|
@ -45,21 +45,36 @@ unset(_expectedTargets)
|
|||
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
if(_IMPORT_PREFIX STREQUAL "/")
|
||||
set(_IMPORT_PREFIX "")
|
||||
endif()
|
||||
|
||||
# Create imported target lua_static
|
||||
add_library(lua_static STATIC IMPORTED)
|
||||
# Create imported target Lua::lua_internal
|
||||
add_library(Lua::lua_internal INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
INTERFACE_LINK_LIBRARIES "m;dl"
|
||||
set_target_properties(Lua::lua_internal PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX;LUA_USE_DLOPEN"
|
||||
INTERFACE_COMPILE_OPTIONS "-Wall;-Wextra"
|
||||
INTERFACE_LINK_LIBRARIES "Lua::lua_include;m;dl"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
|
||||
# Create imported target Lua::lua_include
|
||||
add_library(Lua::lua_include INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_include PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
)
|
||||
|
||||
# Create imported target Lua::lua_static
|
||||
add_library(Lua::lua_static STATIC IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Lua::lua_internal>;Lua::lua_include"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
|
||||
endif()
|
||||
|
||||
# Load information for each installed configuration.
|
||||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
#define LUA_VERSION_MAJOR "5"
|
||||
#define LUA_VERSION_MINOR "4"
|
||||
#define LUA_VERSION_RELEASE "4"
|
||||
#define LUA_VERSION_RELEASE "6"
|
||||
|
||||
#define LUA_VERSION_NUM 504
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 4)
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6)
|
||||
|
||||
#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
|
||||
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2022 Lua.org, PUC-Rio"
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio"
|
||||
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
|
||||
|
||||
|
||||
|
|
@ -131,6 +131,16 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
|
|||
typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
|
||||
|
||||
|
||||
/*
|
||||
** Type used by the debug API to collect debug information
|
||||
*/
|
||||
typedef struct lua_Debug lua_Debug;
|
||||
|
||||
|
||||
/*
|
||||
** Functions to be called by the debugger in specific events
|
||||
*/
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -153,7 +163,8 @@ extern const char lua_ident[];
|
|||
LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
|
||||
LUA_API void (lua_close) (lua_State *L);
|
||||
LUA_API lua_State *(lua_newthread) (lua_State *L);
|
||||
LUA_API int (lua_resetthread) (lua_State *L);
|
||||
LUA_API int (lua_closethread) (lua_State *L, lua_State *from);
|
||||
LUA_API int (lua_resetthread) (lua_State *L); /* Deprecated! */
|
||||
|
||||
LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
|
||||
|
||||
|
|
@ -442,12 +453,6 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx);
|
|||
#define LUA_MASKLINE (1 << LUA_HOOKLINE)
|
||||
#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT)
|
||||
|
||||
typedef struct lua_Debug lua_Debug; /* activation record */
|
||||
|
||||
|
||||
/* Functions to be called by the debugger in specific events */
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
|
||||
LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
|
||||
|
|
@ -492,7 +497,7 @@ struct lua_Debug {
|
|||
|
||||
|
||||
/******************************************************************************
|
||||
* Copyright (C) 1994-2022 Lua.org, PUC-Rio.
|
||||
* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
|
|
|
|||
|
|
@ -70,6 +70,12 @@
|
|||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_IOS)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
|
||||
*/
|
||||
|
|
@ -728,7 +734,7 @@
|
|||
** CHANGE it if you need a different limit. This limit is arbitrary;
|
||||
** its only purpose is to stop Lua from consuming unlimited stack
|
||||
** space (and to reserve some numbers for pseudo-indices).
|
||||
** (It must fit into max(size_t)/32.)
|
||||
** (It must fit into max(size_t)/32 and max(int)/2.)
|
||||
*/
|
||||
#if LUAI_IS32INT
|
||||
#define LUAI_MAXSTACK 1000000
|
||||
|
|
@ -747,14 +753,15 @@
|
|||
|
||||
/*
|
||||
@@ LUA_IDSIZE gives the maximum size for the description of the source
|
||||
@@ of a function in debug information.
|
||||
** of a function in debug information.
|
||||
** CHANGE it if you want a different size.
|
||||
*/
|
||||
#define LUA_IDSIZE 60
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
||||
@@ LUAL_BUFFERSIZE is the initial buffer size used by the lauxlib
|
||||
** buffer system.
|
||||
*/
|
||||
#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number)))
|
||||
|
||||
|
|
|
|||
Binary file not shown.
BIN
lua/x86/lib/liblua_static.a
Normal file
BIN
lua/x86/lib/liblua_static.a
Normal file
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
|||
####### Any changes to this file will be overwritten by the next CMake run ####
|
||||
####### The input file was LuaConfig.cmake.in ########
|
||||
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
|
||||
|
||||
macro(set_and_check _var _file)
|
||||
set(${_var} "${_file}")
|
||||
|
|
@ -27,8 +27,21 @@ endmacro()
|
|||
include("${CMAKE_CURRENT_LIST_DIR}/LuaTargets.cmake")
|
||||
|
||||
set_and_check(LUA_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")
|
||||
set_and_check(LUA_LIBRARY "${PACKAGE_PREFIX_DIR}/lib/liblua.a")
|
||||
add_library(Lua::Library ALIAS "Lua::lua_static")
|
||||
get_target_property(LUA_CONFIG "Lua::lua_static" IMPORTED_CONFIGURATIONS)
|
||||
get_target_property(LUA_LIBRARY "Lua::lua_static" "IMPORTED_LOCATION_${LUA_CONFIG}")
|
||||
set(LUA_LIBRARIES "${LUA_LIBRARY}")
|
||||
add_library(Lua::Library ALIAS lua_static)
|
||||
add_library(LUA_INCLUDE_LIB INTERFACE)
|
||||
target_include_directories(LUA_INCLUDE_LIB INTERFACE "${LUA_INCLUDE_DIR}")
|
||||
list(APPEND LUA_LIBRARIES LUA_INCLUDE_LIB)
|
||||
|
||||
foreach(LIB_NAME m;dl)
|
||||
find_library(LIB_LOCATION "${LIB_NAME}")
|
||||
if(NOT LIB_LOCATION)
|
||||
message(FATAL_ERROR "lib${LIB_NAME} not found and is required by lua")
|
||||
else()
|
||||
list(APPEND LUA_LIBRARIES "${LIB_LOCATION}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
check_required_components(Lua)
|
||||
|
|
@ -9,19 +9,19 @@
|
|||
# The variable CVF_VERSION must be set before calling configure_file().
|
||||
|
||||
|
||||
set(PACKAGE_VERSION "5.4.4")
|
||||
set(PACKAGE_VERSION "5.4.6")
|
||||
|
||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
||||
if("5.4.4" MATCHES "^([0-9]+)\\.")
|
||||
if("5.4.6" MATCHES "^([0-9]+)\\.")
|
||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||
endif()
|
||||
else()
|
||||
set(CVF_VERSION_MAJOR "5.4.4")
|
||||
set(CVF_VERSION_MAJOR "5.4.6")
|
||||
endif()
|
||||
|
||||
if(PACKAGE_FIND_VERSION_RANGE)
|
||||
|
|
@ -5,15 +5,15 @@
|
|||
# Commands may need to know the format version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||
|
||||
# Import target "lua_static" for configuration "Release"
|
||||
set_property(TARGET lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
# Import target "Lua::lua_static" for configuration "Release"
|
||||
set_property(TARGET Lua::lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua.a"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua_static.a"
|
||||
)
|
||||
|
||||
list(APPEND _IMPORT_CHECK_TARGETS lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_lua_static "${_IMPORT_PREFIX}/lib/liblua.a" )
|
||||
list(APPEND _IMPORT_CHECK_TARGETS Lua::lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_Lua::lua_static "${_IMPORT_PREFIX}/lib/liblua_static.a" )
|
||||
|
||||
# Commands beyond this point should not need to know the version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION)
|
||||
|
|
@ -16,7 +16,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
|||
set(_targetsDefined)
|
||||
set(_targetsNotDefined)
|
||||
set(_expectedTargets)
|
||||
foreach(_expectedTarget lua_static)
|
||||
foreach(_expectedTarget Lua::lua_internal Lua::lua_include Lua::lua_static)
|
||||
list(APPEND _expectedTargets ${_expectedTarget})
|
||||
if(NOT TARGET ${_expectedTarget})
|
||||
list(APPEND _targetsNotDefined ${_expectedTarget})
|
||||
|
|
@ -45,21 +45,36 @@ unset(_expectedTargets)
|
|||
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
if(_IMPORT_PREFIX STREQUAL "/")
|
||||
set(_IMPORT_PREFIX "")
|
||||
endif()
|
||||
|
||||
# Create imported target lua_static
|
||||
add_library(lua_static STATIC IMPORTED)
|
||||
# Create imported target Lua::lua_internal
|
||||
add_library(Lua::lua_internal INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
INTERFACE_LINK_LIBRARIES "m;dl"
|
||||
set_target_properties(Lua::lua_internal PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX;LUA_USE_DLOPEN"
|
||||
INTERFACE_COMPILE_OPTIONS "-Wall;-Wextra"
|
||||
INTERFACE_LINK_LIBRARIES "Lua::lua_include;m;dl"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
|
||||
# Create imported target Lua::lua_include
|
||||
add_library(Lua::lua_include INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_include PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
)
|
||||
|
||||
# Create imported target Lua::lua_static
|
||||
add_library(Lua::lua_static STATIC IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Lua::lua_internal>;Lua::lua_include"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
|
||||
endif()
|
||||
|
||||
# Load information for each installed configuration.
|
||||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
#define LUA_VERSION_MAJOR "5"
|
||||
#define LUA_VERSION_MINOR "4"
|
||||
#define LUA_VERSION_RELEASE "4"
|
||||
#define LUA_VERSION_RELEASE "6"
|
||||
|
||||
#define LUA_VERSION_NUM 504
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 4)
|
||||
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6)
|
||||
|
||||
#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
|
||||
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2022 Lua.org, PUC-Rio"
|
||||
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio"
|
||||
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
|
||||
|
||||
|
||||
|
|
@ -131,6 +131,16 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
|
|||
typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
|
||||
|
||||
|
||||
/*
|
||||
** Type used by the debug API to collect debug information
|
||||
*/
|
||||
typedef struct lua_Debug lua_Debug;
|
||||
|
||||
|
||||
/*
|
||||
** Functions to be called by the debugger in specific events
|
||||
*/
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -153,7 +163,8 @@ extern const char lua_ident[];
|
|||
LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
|
||||
LUA_API void (lua_close) (lua_State *L);
|
||||
LUA_API lua_State *(lua_newthread) (lua_State *L);
|
||||
LUA_API int (lua_resetthread) (lua_State *L);
|
||||
LUA_API int (lua_closethread) (lua_State *L, lua_State *from);
|
||||
LUA_API int (lua_resetthread) (lua_State *L); /* Deprecated! */
|
||||
|
||||
LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
|
||||
|
||||
|
|
@ -442,12 +453,6 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx);
|
|||
#define LUA_MASKLINE (1 << LUA_HOOKLINE)
|
||||
#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT)
|
||||
|
||||
typedef struct lua_Debug lua_Debug; /* activation record */
|
||||
|
||||
|
||||
/* Functions to be called by the debugger in specific events */
|
||||
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
|
||||
|
||||
|
||||
LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
|
||||
LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
|
||||
|
|
@ -492,7 +497,7 @@ struct lua_Debug {
|
|||
|
||||
|
||||
/******************************************************************************
|
||||
* Copyright (C) 1994-2022 Lua.org, PUC-Rio.
|
||||
* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
|
|
|
|||
|
|
@ -70,6 +70,12 @@
|
|||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_IOS)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
|
||||
*/
|
||||
|
|
@ -728,7 +734,7 @@
|
|||
** CHANGE it if you need a different limit. This limit is arbitrary;
|
||||
** its only purpose is to stop Lua from consuming unlimited stack
|
||||
** space (and to reserve some numbers for pseudo-indices).
|
||||
** (It must fit into max(size_t)/32.)
|
||||
** (It must fit into max(size_t)/32 and max(int)/2.)
|
||||
*/
|
||||
#if LUAI_IS32INT
|
||||
#define LUAI_MAXSTACK 1000000
|
||||
|
|
@ -747,14 +753,15 @@
|
|||
|
||||
/*
|
||||
@@ LUA_IDSIZE gives the maximum size for the description of the source
|
||||
@@ of a function in debug information.
|
||||
** of a function in debug information.
|
||||
** CHANGE it if you want a different size.
|
||||
*/
|
||||
#define LUA_IDSIZE 60
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
||||
@@ LUAL_BUFFERSIZE is the initial buffer size used by the lauxlib
|
||||
** buffer system.
|
||||
*/
|
||||
#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number)))
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
|||
####### Any changes to this file will be overwritten by the next CMake run ####
|
||||
####### The input file was LuaConfig.cmake.in ########
|
||||
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
|
||||
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
|
||||
|
||||
macro(set_and_check _var _file)
|
||||
set(${_var} "${_file}")
|
||||
|
|
@ -27,8 +27,21 @@ endmacro()
|
|||
include("${CMAKE_CURRENT_LIST_DIR}/LuaTargets.cmake")
|
||||
|
||||
set_and_check(LUA_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")
|
||||
set_and_check(LUA_LIBRARY "${PACKAGE_PREFIX_DIR}/lib/liblua.a")
|
||||
add_library(Lua::Library ALIAS "Lua::lua_static")
|
||||
get_target_property(LUA_CONFIG "Lua::lua_static" IMPORTED_CONFIGURATIONS)
|
||||
get_target_property(LUA_LIBRARY "Lua::lua_static" "IMPORTED_LOCATION_${LUA_CONFIG}")
|
||||
set(LUA_LIBRARIES "${LUA_LIBRARY}")
|
||||
add_library(Lua::Library ALIAS lua_static)
|
||||
add_library(LUA_INCLUDE_LIB INTERFACE)
|
||||
target_include_directories(LUA_INCLUDE_LIB INTERFACE "${LUA_INCLUDE_DIR}")
|
||||
list(APPEND LUA_LIBRARIES LUA_INCLUDE_LIB)
|
||||
|
||||
foreach(LIB_NAME m;dl)
|
||||
find_library(LIB_LOCATION "${LIB_NAME}")
|
||||
if(NOT LIB_LOCATION)
|
||||
message(FATAL_ERROR "lib${LIB_NAME} not found and is required by lua")
|
||||
else()
|
||||
list(APPEND LUA_LIBRARIES "${LIB_LOCATION}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
check_required_components(Lua)
|
||||
|
|
@ -9,19 +9,19 @@
|
|||
# The variable CVF_VERSION must be set before calling configure_file().
|
||||
|
||||
|
||||
set(PACKAGE_VERSION "5.4.4")
|
||||
set(PACKAGE_VERSION "5.4.6")
|
||||
|
||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
||||
if("5.4.4" MATCHES "^([0-9]+)\\.")
|
||||
if("5.4.6" MATCHES "^([0-9]+)\\.")
|
||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||
endif()
|
||||
else()
|
||||
set(CVF_VERSION_MAJOR "5.4.4")
|
||||
set(CVF_VERSION_MAJOR "5.4.6")
|
||||
endif()
|
||||
|
||||
if(PACKAGE_FIND_VERSION_RANGE)
|
||||
|
|
@ -5,15 +5,15 @@
|
|||
# Commands may need to know the format version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||
|
||||
# Import target "lua_static" for configuration "Release"
|
||||
set_property(TARGET lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
# Import target "Lua::lua_static" for configuration "Release"
|
||||
set_property(TARGET Lua::lua_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua.a"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/liblua_static.a"
|
||||
)
|
||||
|
||||
list(APPEND _IMPORT_CHECK_TARGETS lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_lua_static "${_IMPORT_PREFIX}/lib/liblua.a" )
|
||||
list(APPEND _IMPORT_CHECK_TARGETS Lua::lua_static )
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_Lua::lua_static "${_IMPORT_PREFIX}/lib/liblua_static.a" )
|
||||
|
||||
# Commands beyond this point should not need to know the version.
|
||||
set(CMAKE_IMPORT_FILE_VERSION)
|
||||
|
|
@ -16,7 +16,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
|||
set(_targetsDefined)
|
||||
set(_targetsNotDefined)
|
||||
set(_expectedTargets)
|
||||
foreach(_expectedTarget lua_static)
|
||||
foreach(_expectedTarget Lua::lua_internal Lua::lua_include Lua::lua_static)
|
||||
list(APPEND _expectedTargets ${_expectedTarget})
|
||||
if(NOT TARGET ${_expectedTarget})
|
||||
list(APPEND _targetsNotDefined ${_expectedTarget})
|
||||
|
|
@ -45,21 +45,36 @@ unset(_expectedTargets)
|
|||
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
if(_IMPORT_PREFIX STREQUAL "/")
|
||||
set(_IMPORT_PREFIX "")
|
||||
endif()
|
||||
|
||||
# Create imported target lua_static
|
||||
add_library(lua_static STATIC IMPORTED)
|
||||
# Create imported target Lua::lua_internal
|
||||
add_library(Lua::lua_internal INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(lua_static PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
INTERFACE_LINK_LIBRARIES "m;dl"
|
||||
set_target_properties(Lua::lua_internal PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "LUA_USE_POSIX;LUA_USE_DLOPEN"
|
||||
INTERFACE_COMPILE_OPTIONS "-Wall;-Wextra"
|
||||
INTERFACE_LINK_LIBRARIES "Lua::lua_include;m;dl"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
|
||||
# Create imported target Lua::lua_include
|
||||
add_library(Lua::lua_include INTERFACE IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_include PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
)
|
||||
|
||||
# Create imported target Lua::lua_static
|
||||
add_library(Lua::lua_static STATIC IMPORTED)
|
||||
|
||||
set_target_properties(Lua::lua_static PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Lua::lua_internal>;Lua::lua_include"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
|
||||
endif()
|
||||
|
||||
# Load information for each installed configuration.
|
||||
Loading…
Add table
Add a link
Reference in a new issue