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

revert extra changes in CMakeLists.txt

Browse source
This commit is contained in:
MihailRis 2024-06-12 00:47:54 +03:00
parent 2061665dd2
commit a340c8525c
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -1,5 +1,4 @@
option(VOXELENGINE_BUILD_WINDOWS_VCPKG OFF) option(VOXELENGINE_BUILD_WINDOWS_VCPKG OFF)
if(VOXELENGINE_BUILD_WINDOWS_VCPKG AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake") if(VOXELENGINE_BUILD_WINDOWS_VCPKG AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
endif() endif()
@ -91,12 +90,12 @@ endif()
if (WIN32) if (WIN32)
if(VOXELENGINE_BUILD_WINDOWS_VCPKG) if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
find_package(spng REQUIRED) find_package(spng REQUIRED)
find_package(glm REQUIRED) find_package(glm REQUIRED)
find_package(vorbis REQUIRED) find_package(vorbis REQUIRED)
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
set(PNGLIB spng::spng) set(PNGLIB spng::spng)
set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile) set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile)
else() else()