From d062c28376d3d00eb7ea52472d95f7d89666a479 Mon Sep 17 00:00:00 2001 From: nogitsune-youkai Date: Fri, 2 Oct 2026 17:23:49 +0300 Subject: [PATCH] Fix: correct luajit lookup on Windows (#1006) * Fix: correct luajit paths * fixed comment * removed unnecessary comments --- src/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbe8a9763..802c06e1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,23 +27,23 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "Windows") find_package(vorbis REQUIRED) + + set(LUAJIT_PACKAGE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") if(VCPKG_TARGET_TRIPLET MATCHES "static") add_library(luajit STATIC IMPORTED) set_target_properties( luajit PROPERTIES IMPORTED_LOCATION - "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/lib/libluajit-5.1.a" + "${LUAJIT_PACKAGE_DIR}/lib/libluajit-5.1.a" INTERFACE_INCLUDE_DIRECTORIES - "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/" + "${LUAJIT_PACKAGE_DIR}/include/" ) else() - set(LUAJIT_PACKAGE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}") - - if(EXISTS "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit-2.1") - set(LUAJIT_INCLUDE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit-2.1") + if(EXISTS "${LUAJIT_PACKAGE_DIR}/include/luajit-2.1") + set(LUAJIT_INCLUDE_DIR "${LUAJIT_PACKAGE_DIR}/include/luajit-2.1") else() - set(LUAJIT_INCLUDE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit") + set(LUAJIT_INCLUDE_DIR "${LUAJIT_PACKAGE_DIR}/include/luajit") endif() add_library(luajit SHARED IMPORTED) @@ -51,9 +51,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") luajit PROPERTIES IMPORTED_LOCATION - "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/bin/lua51.dll" + "${LUAJIT_PACKAGE_DIR}/bin/lua51.dll" IMPORTED_IMPLIB - "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/lib/lua51.lib" + "${LUAJIT_PACKAGE_DIR}/lib/lua51.lib" INTERFACE_INCLUDE_DIRECTORIES "${LUAJIT_INCLUDE_DIR}" ) endif()