mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Add sol2
Co-authored-by: Nerixyz <nerixdev@outlook.de>
This commit is contained in:
parent
58a553cf3f
commit
ef2ae52bed
5 changed files with 27 additions and 1 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -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
|
||||
|
|
|
@ -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
20
cmake/FindSol2.cmake
Normal 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
1
lib/sol2
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 2b0d2fe8ba0074e16b499940c4f3126b9c7d3471
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue