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

🛠 Fix up some bad defines and CMake paths

Browse Source
This commit is contained in:
ThePhD 2021-10-27 17:37:55 -04:00
parent b43962957f
commit a7da2a8e88
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -269,7 +269,7 @@ if (sol2-is-top-level-project)
set_target_properties(${lualib} set_target_properties(${lualib}
PROPERTIES PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIR} INTERFACE_INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIR}
INTERFACE_LINK_LIBRARIES ${LUA_SEARCH_DEPENDENCY_LIBS} ${CMAKE_DL_LIBS} INTERFACE_LINK_LIBRARIES "${LUA_SEARCH_DEPENDENCY_LIBS} ${CMAKE_DL_LIBS}"
IMPORTED_LINK_INTERFACE_LANGUAGES C IMPORTED_LINK_INTERFACE_LANGUAGES C
IMPORTED_LOCATION ${lualiblocation}) IMPORTED_LOCATION ${lualiblocation})
set(LUA_LIBRARIES ${lualib}) set(LUA_LIBRARIES ${lualib})

4
tests/run_time/source/functions.cpp
View File

@ -368,8 +368,8 @@ TEST_CASE("functions/function_result and protected_function_result",
} }
} }
#if SOL_IS_OFF(SOL_COMPILER_VCXX_CLANG_I_) \ #if 0
&& (!defined(SOL2_CI) && !(SOL2_CI) && ((!defined(_M_IX86) || defined(_M_IA64)) || (defined(_WIN64)) || (defined(__LLP64__) || defined(__LP64__)))) //&& (!defined(SOL2_CI) && !(SOL2_CI) && ((!defined(_M_IX86) || defined(_M_IA64)) || (defined(_WIN64)) || (defined(__LLP64__) || defined(__LP64__))))
TEST_CASE("functions/safe protected_function_result handlers", TEST_CASE("functions/safe protected_function_result handlers",
"These tests will (hopefully) not destroy the stack since they are supposed to be mildly safe. Still, run with caution.") { "These tests will (hopefully) not destroy the stack since they are supposed to be mildly safe. Still, run with caution.") {
sol::state lua; sol::state lua;