Co-authored-by: Nerixyz <nerixdev@outlook.de>
This commit is contained in:
Mm2PL 2024-09-04 13:31:51 +02:00
parent 58a553cf3f
commit ef2ae52bed
No known key found for this signature in database
GPG key ID: 94AC9B80EFA15ED9
5 changed files with 27 additions and 1 deletions

3
.gitmodules vendored
View file

@ -44,3 +44,6 @@
[submodule "lib/expected-lite"]
path = lib/expected-lite
url = https://github.com/martinmoene/expected-lite
[submodule "lib/sol2"]
path = lib/sol2
url = https://github.com/ThePhD/sol2.git

View file

@ -212,6 +212,8 @@ endif()
if (CHATTERINO_PLUGINS)
set(LUA_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/lib/lua/src")
add_subdirectory(lib/lua)
find_package(Sol2 REQUIRED)
endif()
if (BUILD_WITH_CRASHPAD)

20
cmake/FindSol2.cmake Normal file
View file

@ -0,0 +1,20 @@
include(FindPackageHandleStandardArgs)
find_path(Sol2_INCLUDE_DIR sol/sol.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/sol2/include)
find_package_handle_standard_args(Sol2 DEFAULT_MSG Sol2_INCLUDE_DIR)
if (Sol2_FOUND)
add_library(Sol2 INTERFACE IMPORTED)
set_target_properties(Sol2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Sol2_INCLUDE_DIR}"
)
target_compile_definitions(Sol2 INTERFACE
SOL_ALL_SAFETIES_ON=1
SOL_USING_CXX_LUA=1
)
target_link_libraries(Sol2 INTERFACE lua)
add_library(sol2::sol2 ALIAS Sol2)
endif ()
mark_as_advanced(Sol2_INCLUDE_DIR)

1
lib/sol2 Submodule

@ -0,0 +1 @@
Subproject commit 2b0d2fe8ba0074e16b499940c4f3126b9c7d3471

View file

@ -787,7 +787,7 @@ target_link_libraries(${LIBRARY_PROJECT}
$<$<BOOL:${WIN32}>:Wtsapi32>
)
if (CHATTERINO_PLUGINS)
target_link_libraries(${LIBRARY_PROJECT} PUBLIC lua)
target_link_libraries(${LIBRARY_PROJECT} PUBLIC lua sol2::sol2)
endif()
if (BUILD_WITH_QTKEYCHAIN)