Skip to content
Permalink
Browse files

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: #9119
  • Loading branch information
vilhelmgray authored and sfan5 committed Nov 16, 2019
1 parent 49365b2 commit 706b6aad06a112f55105f08b6acd130b276a06ca
Showing with 1 addition and 1 deletion.
  1. +1 −1 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)

0 comments on commit 706b6aa

Please sign in to comment.
You can’t perform that action at this time.