diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2019-11-16 13:14:24 -0500 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2019-12-31 21:39:16 +0000 |
| commit | 5e4739b4607e2867783c71c0301e1aa3df16529a (patch) | |
| tree | 4cf97bfa02db4389117b8cf216b360a1d242b36b | |
| parent | 0d8f598df214f9464baa939f2a7ce1d1750101a9 (diff) | |
| download | minetest-5e4739b4607e2867783c71c0301e1aa3df16529a.tar.gz minetest-5e4739b4607e2867783c71c0301e1aa3df16529a.tar.bz2 minetest-5e4739b4607e2867783c71c0301e1aa3df16529a.zip | |
Fix find_path for newer jsoncpp installations
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
| -rw-r--r-- | cmake/Modules/FindJson.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake index 26339a295..53ddf4599 100644 --- a/cmake/Modules/FindJson.cmake +++ b/cmake/Modules/FindJson.cmake @@ -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) |