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

Fixes for compiling with a newer (system) jsoncpp #4429

Merged
merged 3 commits into from
Aug 10, 2016
Merged

Fixes for compiling with a newer (system) jsoncpp #4429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
617e005
Move included json code to jsoncpp subdirectory
Rogier-5 Aug 10, 2016
3c919f6
Fix json includes
Rogier-5 Aug 10, 2016
4393bd8
Fix for jsoncpp deprecated function warning
Rogier-5 Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
Move included json code to jsoncpp subdirectory 
This is needed to avoid having to specify the minetest src directory
as a system include when fixing the json includes.
  • Loading branch information
@Rogier-5
Rogier-5 committed Aug 10, 2016
commit 617e00505a7c7e8bb21d84a2ac2b605aff7fddd3
4 changes: 2 additions & 2 deletions cmake/Modules/FindJson.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ endif()

if(NOT JSONCPP_FOUND)
message(STATUS "Using bundled JSONCPP library.")
set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json)
set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp)
set(JSON_LIBRARY jsoncpp)
add_subdirectory(json)
add_subdirectory(jsoncpp/json)
endif()

0 src/json/CMakeLists.txt → src/jsoncpp/json/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 src/json/UPDATING → src/jsoncpp/json/UPDATING
View file
Open in desktop
File renamed without changes.
0 src/json/json.h → src/jsoncpp/json/json.h
View file
Open in desktop
File renamed without changes.
0 src/json/jsoncpp.cpp → src/jsoncpp/json/jsoncpp.cpp
View file
Open in desktop
File renamed without changes.