aboutsummaryrefslogtreecommitdiff
path: root/cmake/Modules
diff options
context:
space:
mode:
authorRogier-5 <Rogier-5@users.noreply.github.com>2016-08-10 12:10:00 +0200
committerest31 <est31@users.noreply.github.com>2016-08-10 12:10:00 +0200
commit4503b5097f99d2806763650f33d8ef3b49f77ce4 (patch)
treed682a8b3ac13c79ece798ae05b9546ecfa770382 /cmake/Modules
parent058a869b70072aba8baea47e359c45e82daaf152 (diff)
downloadminetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.tar.gz
minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.tar.bz2
minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.zip
Fixes for compiling with a newer (system) jsoncpp (#4429)
* 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. * Fix json includes They used "", so that the compiler searches the project's directory first. The result was that when compiling with a system jsoncpp, the project's own version of json.h was still included, instead of the system version. The includes now use <>, so a system location, or one specified with '-Ilocation' is searched only. * Fix for jsoncpp deprecated function warning When compiling with a newer version of jsoncpp (and ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning about a deprecated function that minetest uses.
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/FindJson.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
index 1558b0fcf..e69d6c4c0 100644
--- a/cmake/Modules/FindJson.cmake
+++ b/cmake/Modules/FindJson.cmake
@@ -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()