diff --git a/CMakeLists.txt b/CMakeLists.txt index 869c994a5ae..c68d2e00818 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,8 +257,15 @@ find_package(Doxygen) find_package(BoostCertify REQUIRED) if (CHATTERINO_PLUGINS) - set(LUA_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/lib/lua/src") - add_subdirectory(lib/lua) + + find_package(Lua 5.4) + + if (NOT Lua_FOUND) + set(LUA_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/lib/lua/src") + add_subdirectory(lib/lua) + else() + set(LUA_INCLUDE_DIRS "${Lua_INCLUDE_DIRS}") + endif() find_package(Sol2 REQUIRED) endif() diff --git a/cmake/FindSol2.cmake b/cmake/FindSol2.cmake index be64d000c6e..44c381e0fdd 100644 --- a/cmake/FindSol2.cmake +++ b/cmake/FindSol2.cmake @@ -11,10 +11,14 @@ if (Sol2_FOUND) ) target_compile_definitions(Sol2 INTERFACE SOL_ALL_SAFETIES_ON=1 - SOL_USING_CXX_LUA=1 + SOL_USING_CXX_LUA=0 SOL_NO_NIL=0 ) - target_link_libraries(Sol2 INTERFACE lua) + if(TARGET Lua::Lua) + target_link_libraries(Sol2 INTERFACE Lua::Lua) + else() + target_link_libraries(Sol2 INTERFACE lua) + endif() add_library(sol2::sol2 ALIAS Sol2) endif ()