Merge branch 'core4' into feature/vcpkg-pipeline

# Conflicts:
#	.github/workflows/cross-compile-client.yml

Author: zerotacg

.github/workflows/cross-compile-client.yml

@@ -23,6 +23,7 @@ on:
       - CMakeModules/**
       - CMakeLists.txt
       - CMakePresets.json
+  workflow_dispatch:
 
 jobs:
   build:
@@ -68,7 +69,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ${{ steps.strings.outputs.vcpkg-dir }}
-        key: ubuntu-24.04-vcpkg-cache
+        key: vcpkg-ubuntu-24.04-mingw
 
     - name: Configure CMake
       run: >

CMakeModules/FindLua52.cmake

@@ -17,7 +17,7 @@ MACRO(FIND_CORRECT_LUA_VERSION)
       CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
       IF(LUALIB_FOUND)
         MESSAGE(STATUS "Luabind is using Lua 5.4")
-        FIND_PACKAGE(Lua54 REQUIRED)
+        FIND_PACKAGE(Lua REQUIRED 5.4)
         BREAK()
       ENDIF()
     ENDFOREACH()
@@ -30,7 +30,7 @@ MACRO(FIND_CORRECT_LUA_VERSION)
         CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
         IF(LUALIB_FOUND)
           MESSAGE(STATUS "Luabind is using Lua 5.3")
-          FIND_PACKAGE(Lua53 REQUIRED)
+          FIND_PACKAGE(Lua REQUIRED 5.3)
           BREAK()
         ENDIF()
       ENDFOREACH()
@@ -44,7 +44,7 @@ MACRO(FIND_CORRECT_LUA_VERSION)
         CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
         IF(LUALIB_FOUND)
           MESSAGE(STATUS "Luabind is using Lua 5.2")
-          FIND_PACKAGE(Lua52 REQUIRED)
+          FIND_PACKAGE(Lua REQUIRED 5.2)
           BREAK()
         ENDIF()
       ENDFOREACH()
@@ -58,7 +58,7 @@ MACRO(FIND_CORRECT_LUA_VERSION)
         CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
         IF(LUALIB_FOUND)
           MESSAGE(STATUS "Luabind is using Lua 5.1")
-          FIND_PACKAGE(Lua51 REQUIRED)
+          FIND_PACKAGE(Lua REQUIRED 5.1)
           BREAK()
         ENDIF()
       ENDFOREACH()
@@ -72,7 +72,7 @@ MACRO(FIND_CORRECT_LUA_VERSION)
         CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
         IF(LUALIB_FOUND)
           MESSAGE(STATUS "Luabind is using Lua 5.0")
-          FIND_PACKAGE(Lua50 REQUIRED)
+          FIND_PACKAGE(Lua REQUIRED 5.0)
           BREAK()
         ENDIF()
       ENDFOREACH()
@@ -88,17 +88,26 @@ MACRO(FIND_CORRECT_LUA_VERSION)
       FIND_PACKAGE(Lua CONFIG REQUIRED)
       SET(LUA_LIBRARIES Lua::lua_lib)
     ELSEIF(WITH_LUA54)
-      FIND_PACKAGE(Lua54 REQUIRED)
+      FIND_PACKAGE(Lua REQUIRED 5.4)
     ELSEIF(WITH_LUA53)
-      FIND_PACKAGE(Lua53 REQUIRED)
+      FIND_PACKAGE(Lua REQUIRED 5.3)
     ELSEIF(WITH_LUA52)
-      FIND_PACKAGE(Lua52 REQUIRED)
+      FIND_PACKAGE(Lua REQUIRED 5.2)
     ELSEIF(WITH_LUA51)
-      FIND_PACKAGE(Lua51 REQUIRED)
+      FIND_PACKAGE(Lua REQUIRED 5.1)
     ELSE()
-      FIND_PACKAGE(Lua50 REQUIRED)
+      FIND_PACKAGE(Lua REQUIRED 5.0)
     ENDIF()
   ENDIF()
+  if(Lua_FOUND AND NOT TARGET Lua::Lua)
+      add_library(Lua::Lua INTERFACE IMPORTED)
+      set_target_properties(
+              Lua::Lua
+              PROPERTIES
+              INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
+              INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
+      )
+  endif()
 ENDMACRO()
 
 IF(LUABIND_LIBRARIES AND LUABIND_INCLUDE_DIR)