mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-01 17:38:41 +00:00
Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of src/ (#5473)
* Update embedded jsoncpp from unk version to 0.10.6 0.10.6 is last release without c++11 * Make jsoncpp more compliant with its amalgamate Jsoncpp cpp file should be upper, make the library like it does in amalgamate * Reorganization: move minetest embedded libs outside of source tree to /lib * Fix a dead grep in LINT
This commit is contained in:
parent
75fb3e4730
commit
86b1542181
75 changed files with 6986 additions and 6345 deletions
23
lib/CMakeLists.txt
Normal file
23
lib/CMakeLists.txt
Normal file
|
@ -0,0 +1,23 @@
|
|||
# LuaJIT
|
||||
option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
|
||||
set(USE_LUAJIT FALSE PARENT_SCOPE)
|
||||
if(ENABLE_LUAJIT)
|
||||
find_package(LuaJIT)
|
||||
if(LUAJIT_FOUND)
|
||||
set(USE_LUAJIT TRUE)
|
||||
set(USE_LUAJIT TRUE PARENT_SCOPE)
|
||||
message (STATUS "Using LuaJIT provided by system.")
|
||||
endif(LUAJIT_FOUND)
|
||||
else()
|
||||
message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
|
||||
endif()
|
||||
|
||||
if(NOT USE_LUAJIT)
|
||||
message(STATUS "LuaJIT not found, using bundled Lua.")
|
||||
set(LUA_LIBRARY lua PARENT_SCOPE)
|
||||
set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lua/src PARENT_SCOPE)
|
||||
add_subdirectory(lua)
|
||||
endif()
|
||||
|
||||
find_package(GMP REQUIRED)
|
||||
find_package(Json REQUIRED)
|
Loading…
Add table
Add a link
Reference in a new issue