From 16d2488f4291745e06610a1fded40b2397f5e705 Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Sun, 30 Apr 2023 10:43:34 -0400 Subject: [PATCH] Update CMakeLists and README.md for v5.4.5 --- CMakeLists.txt | 6 +- lua-5.4.5/CMakeLists.txt | 166 +++++++++++++++++++++++++++++++++++ lua-5.4.5/LuaConfig.cmake.in | 9 ++ 3 files changed, 178 insertions(+), 3 deletions(-) create mode 100644 lua-5.4.5/CMakeLists.txt create mode 100644 lua-5.4.5/LuaConfig.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index b06c9db..4836b11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -project(lua LANGUAGES C VERSION 5.4.4) +project(lua LANGUAGES C VERSION 5.4.5) option(LUA_SUPPORT_DL "Support dynamic loading of compiled modules" OFF) option(LUA_BUILD_AS_CXX "Build lua as C++" OFF) @@ -25,8 +25,8 @@ else() option(LUA_BUILD_COMPILER "Build luac compiler" ON) endif() -add_subdirectory(lua-5.4.4) +add_subdirectory(lua-5.4.5) if(LUA_ENABLE_TESTING) - add_test(NAME lua-testsuite COMMAND lua -e "_U=true" all.lua WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lua-5.4.4-tests) + add_test(NAME lua-testsuite COMMAND lua -e "_U=true" all.lua WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lua-5.4.5-tests) endif() diff --git a/lua-5.4.5/CMakeLists.txt b/lua-5.4.5/CMakeLists.txt new file mode 100644 index 0000000..dd36dbe --- /dev/null +++ b/lua-5.4.5/CMakeLists.txt @@ -0,0 +1,166 @@ +set(LUA_LIB_SRCS + "src/lapi.c" + "src/lcode.c" + "src/lctype.c" + "src/ldebug.c" + "src/ldo.c" + "src/ldump.c" + "src/lfunc.c" + "src/lgc.c" + "src/llex.c" + "src/lmem.c" + "src/lobject.c" + "src/lopcodes.c" + "src/lparser.c" + "src/lstate.c" + "src/lstring.c" + "src/ltable.c" + "src/ltm.c" + "src/lundump.c" + "src/lvm.c" + "src/lzio.c" + "src/lauxlib.c" + "src/lbaselib.c" + "src/lcorolib.c" + "src/ldblib.c" + "src/liolib.c" + "src/lmathlib.c" + "src/loadlib.c" + "src/loslib.c" + "src/lstrlib.c" + "src/ltablib.c" + "src/lutf8lib.c" + "src/linit.c" +) + +set(TARGETS_TO_INSTALL lua_internal lua_include) + +if(LUA_BUILD_AS_CXX) + set_source_files_properties(${LUA_LIB_SRCS} "src/lua.c" "src/luac.c" PROPERTIES LANGUAGE CXX ) +endif() + +add_library(lua_internal INTERFACE) + +add_library(lua_include INTERFACE) + +target_include_directories(lua_include INTERFACE + $ + $ +) + +target_link_libraries(lua_internal INTERFACE lua_include) + +if(LUA_ENABLE_SHARED) + add_library(lua_shared SHARED ${LUA_LIB_SRCS}) + target_link_libraries(lua_shared PRIVATE lua_internal PUBLIC lua_include) + set_target_properties(lua_shared PROPERTIES + VERSION "${PACKAGE_VERSION}" + ) + if(WIN32) + target_compile_definitions(lua_shared PRIVATE LUA_BUILD_AS_DLL) + endif() + list(APPEND TARGETS_TO_INSTALL lua_shared) + if(BUILD_SHARED_LIBS) + add_library(Lua::Library ALIAS lua_shared) + elseif(NOT TOP_LEVEL) + set_target_properties(lua_shared PROPERTIES + EXCLUDE_FROM_ALL ON + ) + endif() +endif() + +add_library(lua_static STATIC ${LUA_LIB_SRCS}) +target_link_libraries(lua_static PRIVATE lua_internal PUBLIC lua_include) +set_target_properties(lua_static PROPERTIES + VERSION "${PACKAGE_VERSION}" +) +list(APPEND TARGETS_TO_INSTALL lua_static) +if(NOT BUILD_SHARED_LIBS OR NOT LUA_ENABLE_SHARED) + add_library(Lua::Library ALIAS lua_static) +endif() + + +if(UNIX) + if(NOT EMSCRIPTEN) + find_library(LIBM m) + #TODO: Redo this with find_package + if(NOT LIBM) + message(FATAL_ERROR "libm not found and is required by lua") + endif() + target_link_libraries(lua_internal INTERFACE m) + + target_compile_definitions(lua_internal + INTERFACE LUA_USE_POSIX + ) + if(LUA_SUPPORT_DL) + target_compile_definitions(lua_internal INTERFACE "LUA_USE_DLOPEN") + target_link_libraries(lua_internal INTERFACE dl) + endif() + endif() + + target_compile_options(lua_internal + INTERFACE "-Wall" "-Wextra" + ) +elseif(Win32) + target_compile_options(lua_internal + INTERFACE "/Wall" + ) +endif() + +if(LUA_BUILD_BINARY) + include(CheckIncludeFile) + CHECK_INCLUDE_FILE("readline/readline.h" HAVE_READLINE_READLINE_H) + + add_executable(lua "src/lua.c") + # Can not use lua_shared because some symbols are not exported + target_link_libraries(lua PRIVATE lua_static) + set_target_properties(lua PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} + ) + if (HAVE_READLINE_READLINE_H) + target_compile_definitions(lua PRIVATE "LUA_USE_READLINE") + target_link_libraries(lua PUBLIC readline) + endif() + list(APPEND TARGETS_TO_INSTALL lua) +endif() + +if(LUA_BUILD_COMPILER) + add_executable(luac "src/luac.c") + target_link_libraries(luac PRIVATE lua_static) + set_target_properties(luac PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} + ) + list(APPEND TARGETS_TO_INSTALL luac) +endif() + +install(TARGETS ${TARGETS_TO_INSTALL} + EXPORT LuaTargets +) + +install(DIRECTORY include/ TYPE INCLUDE) + +include(CMakePackageConfigHelpers) + +get_target_property(LUA_EXPORT_LIBRARY Lua::Library ALIASED_TARGET) +write_basic_package_version_file( + LuaConfigVersion.cmake + VERSION ${PACKAGE_VERSION} + COMPATIBILITY SameMajorVersion +) + +install(EXPORT LuaTargets + FILE LuaTargets.cmake + DESTINATION "lib/cmake" + NAMESPACE Lua:: +) + +configure_package_config_file( + LuaConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/LuaConfig.cmake" + INSTALL_DESTINATION "lib/cmake" +) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LuaConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/LuaConfigVersion.cmake" + DESTINATION "lib/cmake" +) diff --git a/lua-5.4.5/LuaConfig.cmake.in b/lua-5.4.5/LuaConfig.cmake.in new file mode 100644 index 0000000..8f32b2c --- /dev/null +++ b/lua-5.4.5/LuaConfig.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/LuaTargets.cmake") + +set_and_check(LUA_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include") +add_library(Lua::Library ALIAS "Lua::@LUA_EXPORT_LIBRARY@") +set(LUA_LIBRARIES "Lua::Library") + +check_required_components(Lua)