Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 9 commits into from
Apr 2, 2017
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66175d2
Update embedded jsoncpp from unk version to 0.10.6
nerzhul Mar 28, 2017
d939f03
Make jsoncpp more compliant with its amalgamate
nerzhul Mar 28, 2017
7f0e456
Reorganization: move minetest embedded libs outside of source tree to…
nerzhul Mar 31, 2017
80eb2dd
Android fix + better cmake style
nerzhul Mar 31, 2017
7a3ee48
Fix scope for lua
nerzhul Mar 31, 2017
585c3b0
Forget to port this change
nerzhul Mar 31, 2017
7a3ad80
Try to fix some cmakeversions build
nerzhul Mar 31, 2017
3313b1a
Cmake fix for windows & macosx
nerzhul Mar 31, 2017
f619b96
Fix a dead grep in LINT
nerzhul Apr 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make jsoncpp more compliant with its amalgamate 
Jsoncpp cpp file should be upper, make the library like it does in amalgamate
  • Loading branch information
@nerzhul
nerzhul committed Mar 28, 2017
commit d939f034956324cde866902d63f4c6c42f37311f
2 changes: 1 addition & 1 deletion cmake/Modules/FindJson.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ 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)
add_subdirectory(jsoncpp)
endif()

0 src/jsoncpp/json/CMakeLists.txt → src/jsoncpp/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/jsoncpp/json/jsoncpp.cpp → src/jsoncpp/jsoncpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ license you like.



#include "json.h"
#include "json/json.h"

#ifndef JSON_IS_AMALGAMATION
#error "Compile with -I PATH_TO_JSON_DIRECTORY"
Expand Down