minetest-stuffs/dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of src/ (#5473)

Browse Source 
* 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:
Loïc Blot
2017-04-02 10:51:50 +02:00
committed by GitHub
parent 75fb3e4730
commit 86b1542181
75 changed files with 6986 additions and 6345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Modules/FindJson.cmake
View File

@@ -20,8 +20,7 @@ endif()
if(NOT JSONCPP_FOUND)
message(STATUS "Using bundled JSONCPP library.")
set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp)
set(JSON_LIBRARY jsoncpp)
add_subdirectory(jsoncpp/json)
set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp PARENT_SCOPE)
set(JSON_LIBRARY jsoncpp PARENT_SCOPE)
add_subdirectory(jsoncpp)
endif()