voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 12:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix: correct luajit paths

Browse source
This commit is contained in:
nogitsune-youkai 2026-09-30 01:12:38 +03:00
parent 7e572d620f
commit a34b7ea2e6
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/CMakeLists.txt
View file

@ -27,23 +27,25 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(vorbis REQUIRED) find_package(vorbis REQUIRED)
# Resolve luajit from the toolchain-provided installed tree
# (manifest and classic vcpkg modes), not from the temporary
# "packages/" staging directory inside $ENV{VCPKG_ROOT}.
set(LUAJIT_PACKAGE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
if(VCPKG_TARGET_TRIPLET MATCHES "static") if(VCPKG_TARGET_TRIPLET MATCHES "static")
add_library(luajit STATIC IMPORTED) add_library(luajit STATIC IMPORTED)
set_target_properties( set_target_properties(
luajit luajit
PROPERTIES PROPERTIES
IMPORTED_LOCATION 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 INTERFACE_INCLUDE_DIRECTORIES
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/" "${LUAJIT_PACKAGE_DIR}/include/"
) )
else() else()
set(LUAJIT_PACKAGE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}") if(EXISTS "${LUAJIT_PACKAGE_DIR}/include/luajit-2.1")
set(LUAJIT_INCLUDE_DIR "${LUAJIT_PACKAGE_DIR}/include/luajit-2.1")
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")
else() 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() endif()
add_library(luajit SHARED IMPORTED) add_library(luajit SHARED IMPORTED)
@ -51,9 +53,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
luajit luajit
PROPERTIES PROPERTIES
IMPORTED_LOCATION IMPORTED_LOCATION
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/bin/lua51.dll" "${LUAJIT_PACKAGE_DIR}/bin/lua51.dll"
IMPORTED_IMPLIB 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}" INTERFACE_INCLUDE_DIRECTORIES "${LUAJIT_INCLUDE_DIR}"
) )
endif() endif()