diff --git a/CMakeLists.txt b/CMakeLists.txt index 67e758d6..b9f07a38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,14 +80,15 @@ set(PRJ_SOURCES src/ChronoWrapper.cpp ) -find_package(Lua REQUIRED) +# fix for sol2 +find_path(LUAJIT_INCLUDE_DIR lua.hpp PATH_SUFFIXES luajit) # set the source file containing main() set(PRJ_MAIN src/main.cpp) # set the source file containing the test's main set(PRJ_TEST_MAIN test/test_main.cpp) # set include paths not part of libraries -set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) +set(PRJ_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR}) # set compile features (e.g. standard version) set(PRJ_COMPILE_FEATURES cxx_std_20) # set #defines (test enable/disable not included here) @@ -105,9 +106,11 @@ set(PRJ_LIBRARIES libzip::zip OpenSSL::SSL OpenSSL::Crypto CURL::libcurl - ${LUA_LIBRARIES} + lua51 ) +link_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib) + # add dependency find_package calls and similar here find_package(fmt CONFIG REQUIRED) find_package(OpenSSL REQUIRED) diff --git a/src/TConsole.cpp b/src/TConsole.cpp index fb1dc8b0..9017f923 100644 --- a/src/TConsole.cpp +++ b/src/TConsole.cpp @@ -260,8 +260,7 @@ void TConsole::Command_Version(const std::string& cmd, const std::vector