StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge 78dfeedd0504b0a56dbbde04cc0567abe7b92e98 into e8e122e9ce46f4f1c0b04003d8b703fe1b89755a

Browse Source
This commit is contained in:
phwissmann 2024-03-05 13:09:56 +01:00 committed by GitHub
commit 291a8596ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Packages/FindLuaBuild/LuaVanilla.cmake
View File

@ -199,7 +199,7 @@ extern \"C\" {
file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP) file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP)
endif() endif()
set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/include) set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/src)
endif() endif()
# # Target names # # Target names
@ -251,7 +251,9 @@ else()
endif() endif()
target_compile_options(${liblua} target_compile_options(${liblua}
PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS}) PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS})
if(LUA_LOCAL_DIR)
add_dependencies(${liblua} LUA_VANILLA) add_dependencies(${liblua} LUA_VANILLA)
endif()
target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS}) target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
if (UNIX) if (UNIX)
target_link_libraries(${liblua} PRIVATE m) target_link_libraries(${liblua} PRIVATE m)

2
tests/coroutines/source/array_proxy_lifetime.cpp
View File

@ -59,7 +59,7 @@ inline namespace sol2_regression_test_coroutines_array_proxy_lifetime {
value_type operator*() const { value_type operator*() const {
size_t size = a.mpParent.children.size(); size_t size = a.mpParent.children.size();
if (index >= 0 && index < size) { if (index < size) {
return a.mpParent.children[index]; return a.mpParent.children[index];
} }
return std::weak_ptr<A>(); return std::weak_ptr<A>();