From c18c210fe0b75969c8ce640e8b96f8303f6dd65c Mon Sep 17 00:00:00 2001 From: Stepanov Igor Date: Wed, 25 Dec 2024 18:21:46 +0300 Subject: [PATCH] Return old behavior --- CMakeLists.txt | 1 + src/CMakeLists.txt | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e73ed66c..33721bc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ option(VOXELENGINE_BUILD_TESTS "" OFF) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) if (CMAKE_SYSTEM_NAME STREQUAL "Windows") # We use two types linking: for clang build is static (vcpkg triplet x64-windows-static) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec5b1ad8..45a0965f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,11 +28,12 @@ set(LIBS "") if (CMAKE_SYSTEM_NAME STREQUAL "Windows") # Use directly linking to lib instead PkgConfig (because pkg-config dont install on windows as default) # TODO: Do it with findLua. - set(LUA_INCLUDE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit") - find_package(Lua51 REQUIRED) - - message(STATUS "LUA Libraries: ${LUA_LIBRARIES}") - message(STATUS "LUA Include Dir: ${LUA_INCLUDE_DIR}") + if (MSVC) + set(LUA_INCLUDE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit") + find_package(Lua REQUIRED) + else() + set(LIBS ${LIBS} luajit-5.1) + endif() find_package(glfw3 REQUIRED) find_package(glm REQUIRED) find_package(vorbis REQUIRED)