Fix find_path for newer jsoncpp installations
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Sat, 16 Nov 2019 18:14:24 +0000 (13:14 -0500)
committerrubenwardy <rw@rubenwardy.com>
Tue, 31 Dec 2019 21:39:16 +0000 (21:39 +0000)
The upstream JsonCpp project has renamed the `json/features.h` file to
`json/json_features.h`. This patch fixes the JsonCpp installation search
by looking for `json/allocator.h` which has not been renamed on newer
versions of JsonCpp.

Fixes: https://github.com/minetest/minetest/issues/9119

cmake/Modules/FindJson.cmake

index 26339a2959d09819c051ce1d3c261d392e8b3041..53ddf459953c588f5d95997a371f09be736e331d 100644 (file)
@@ -8,7 +8,7 @@ option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP.  May cause seg
 
 if(ENABLE_SYSTEM_JSONCPP)
        find_library(JSON_LIBRARY NAMES jsoncpp)
-       find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp)
+       find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
 
        include(FindPackageHandleStandardArgs)
        find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)