Merge branch 'ThePhD:develop' into develop

.clang-format

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

.dockerignore

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

.gitignore

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -51,6 +51,7 @@ x86/
 scratch/
 
 # CMake
+/.cmake
 build/
 build-sol2/
 CMakeCache.txt
@@ -127,5 +128,6 @@ LuaJIT-2.0/
 LuaJIT-2.1/
 lua-5.1/
 lua-5.2/
-~syncthing*
-.tmp
+~syncthing*
+.tmp
+**/._**

CMakeLists.txt

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -42,7 +42,7 @@ include(FetchContent)
 
 # # # Configuration
 # # Cached defines, strings, paths and options
-set(SOL2_LUA_VERSION "5.3.5" CACHE STRING "The version of Lua needed. Can be 5.1, 5.2, 5.3, 5.4, LuaJIT, or a more specific 3-part version number for a specifc Lua (e.g., 5.3.5 or luajit-2.0.5)")
+set(SOL2_LUA_VERSION "5.4.4" CACHE STRING "The version of Lua needed. Can be 5.1, 5.2, 5.3, 5.4, LuaJIT, or a more specific 3-part version number for a specifc Lua (e.g., 5.4.4 or luajit-2.0.5)")
 set(SOL2_BUILD_LUA TRUE CACHE BOOL "Always build Lua, do not search for it in the system")
 set(SOL2_PLATFORM "x64" CACHE STRING "Target platform to compile for when building binaries (x86, x64)")
 option(SOL2_CI "Whether or not we are in continguous integration mode" OFF)
@@ -105,7 +105,7 @@ target_include_directories(sol2 ${sol2-system-include}
 configure_package_config_file(
 	cmake/sol2-config.cmake.in
 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"
-	INSTALL_DESTINATION lib/cmake/sol2
+	INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/sol2
 	NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
 write_basic_package_version_file(
@@ -120,16 +120,17 @@ if(SOL2_ENABLE_INSTALL)
 		EXPORT sol2)
 
 	install(EXPORT sol2
+		NAMESPACE sol2::
 		FILE sol2-targets.cmake
-		DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2")
 
 	install(DIRECTORY include/sol
 		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 	install(FILES
 		"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"
 		"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config-version.cmake"
-		DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2")
 endif()
 
 # # # sol2 Library - Single header target

Dockerfile

@@ -50,7 +50,7 @@ VOLUME /root/sol2
 # Command line arguments, with default values
 ARG SOL2_PLATFORM=x64
 ARG SOL2_LUA_VERSION=x64
-ARG SOL2_LUA_VERSION=5.3.5
+ARG SOL2_LUA_VERSION=5.4.4
 ARG SOL2_TEST_SINGLE=false
 ARG SOL2_TEST_INTEROP=false
 ARG SOL2_CI=true

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

cmake/Includes/Project.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

cmake/Modules/CheckCompilerDiagnostic.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -89,4 +89,4 @@ function (check_compiler_diagnostic diagnostic)
 	set(--allow-${diagnostic} $<${when}:${allow_prefix}${diagnostic_flag}> PARENT_SCOPE)
 	set(--warn-${diagnostic} $<${when}:${warn_prefix}${diagnostic_flag}> PARENT_SCOPE)
 
-endfunction()
+endfunction()

cmake/Modules/CheckCompilerFlag.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

cmake/Modules/Common/Core.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

cmake/Modules/FindVersion.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

cmake/Packages/FindKaguyaBuild.cmake

@@ -2,7 +2,7 @@
 # # # # sol2
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -45,6 +45,7 @@ ExternalProject_Add(KAGUYA_BUILD_SOURCE
 	GIT_SHALLOW TRUE
 	GIT_SUBMODULES ""
 	GIT_REPOSITORY https://github.com/satoren/kaguya.git
+	GIT_TAG main
 	PREFIX ${kaguya_build_toplevel}
 	SOURCE_DIR ${kaguya_build_toplevel}
 	DOWNLOAD_DIR ${kaguya_build_toplevel}
@@ -60,7 +61,7 @@ ExternalProject_Add(KAGUYA_BUILD_SOURCE
 add_library(${kaguya_lib} INTERFACE)
 add_dependencies(${kaguya_lib} KAGUYA_BUILD_SOURCE)
 target_include_directories(${kaguya_lib} INTERFACE ${kaguya_include_dirs})
-target_link_libraries(${kaguya_lib} INTERFACE ${LUA_LIBRARIES})
+target_link_libraries(${kaguya_lib} INTERFACE Lua::Lua)
 if (NOT MSVC)
 	target_compile_options(${kaguya_lib} INTERFACE
 		-Wno-noexcept-type -Wno-ignored-qualifiers -Wno-unused-parameter)
@@ -73,4 +74,4 @@ set(KAGUYA_INCLUDE_DIRS ${kaguya_include_dirs})
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(KaguyaBuild
 	FOUND_VAR KAGUYABUILD_FOUND
 	REQUIRED_VARS KAGUYA_LIBRARIES KAGUYA_INCLUDE_DIRS
-	VERSION_VAR kaguya_version)
+	VERSION_VAR kaguya_version)

cmake/Packages/FindLua/set_version_vars.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -74,4 +74,4 @@ function(_lua_set_version_vars _prefix _lua_suffix)
     set(_${_prefix}_include_subdirs "${_${_prefix}_include_subdirs}" PARENT_SCOPE)
     set(_${_prefix}_append_versions "${_${_prefix}_append_versions}" PARENT_SCOPE)
     set(_${_prefix}_library_names "${_${_prefix}_library_names}" PARENT_SCOPE)
-endfunction(_lua_set_version_vars)
+endfunction(_lua_set_version_vars)

cmake/Packages/FindLuaBridgeBuild.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -59,7 +59,7 @@ ExternalProject_Add(LUABRIDGE_BUILD_SOURCE
 add_library(${luabridge_lib} INTERFACE)
 add_dependencies(${luabridge_lib} LUABRIDGE_BUILD_SOURCE)
 target_include_directories(${luabridge_lib} INTERFACE ${luabridge_include_dirs})
-target_link_libraries(${luabridge_lib} INTERFACE ${LUA_LIBRARIES})
+target_link_libraries(${luabridge_lib} INTERFACE Lua::Lua)
 if (NOT MSVC)
 	target_compile_options(${luabridge_lib} INTERFACE
 		-Wno-noexcept-type -Wno-ignored-qualifiers -Wno-unused-parameter)
@@ -72,5 +72,3 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuabridgeBuild
 	FOUND_VAR LUABRIDGEBUILD_FOUND
 	REQUIRED_VARS LUABRIDGE_LIBRARIES LUABRIDGE_INCLUDE_DIRS
 	VERSION_VAR luabridge_version)
-
-

cmake/Packages/FindLuaBuild.cmake

@@ -1,7 +1,7 @@
 # # # # sol2
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -39,7 +39,7 @@ function(find_lua_build LUA_VERSION)
 	else()
 		set(LUA_BUILD_LIBNAME lua-${LUA_VERSION})
 	endif()
-	set(LUA_BUILD_TOPLEVEL "${CMAKE_BINARY_DIR}/vendor/${LUA_BUILD_LIBNAME}")
+	set(LUA_BUILD_TOPLEVEL "${CMAKE_BINARY_DIR}/_deps/${LUA_BUILD_LIBNAME}")
 	set(LUA_BUILD_INSTALL_DIR "${LUA_BUILD_TOPLEVEL}")
 	# # Misc needed variables
 	set(LUA_BUILD_LIBRARY_DESCRIPTION "The base name of the library to build either the static or the dynamic library")
@@ -88,7 +88,7 @@ function(find_lua_build LUA_VERSION)
 	endif()
 
 	# # Export variables to the parent scope
-	set(LUA_LIBRARIES ${LUA_LIBRARIES} PARENT_SCOPE)
+	set(LUA_LIBRARIES Lua::Lua PARENT_SCOPE)
 	set(LUA_INTERPRETER ${LUA_INTERPRETER} PARENT_SCOPE)
 	set(LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIRS} PARENT_SCOPE)
 	set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
@@ -107,7 +107,7 @@ if (LuaBuild_FIND_VERSION)
 	endif()
 endif()
 if (NOT LUA_VERSION)
-	set(LUA_VERSION 5.3.5)
+	set(LUA_VERSION 5.4.4)
 endif()
 find_lua_build(${LUA_VERSION})
 unset(find_lua_build)