CMake: fix jsoncpp includes

CMake/Findjsoncpp.cmake

@@ -4,11 +4,11 @@
 #
 # This module defines the following variables:
 #  JSONCPP_FOUND - True if libjsoncpp has been found.
-#  JSONCPP_INCLUDE_DIRS - location to look for headers,
+#  JSONCPP_INCLUDE_DIR - location to look for headers,
 #  JSONCPP_LIBRARIES - the libraries to link against libjsoncpp
 find_path(JSONCPP_INCLUDE_DIR json/features.h
-    PATH_SUFFIXES include jsoncpp)
+    PATH_SUFFIXES include jsoncpp include/jsoncpp)
 find_library(JSONCPP_LIBRARY jsoncpp)
 include(FindPackageHandleStandardArgs)
@@ -21,6 +21,6 @@ endif(NOT JSONCPP_FOUND)
 set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
 mark_as_advanced(
-    JSONCPP_INCLUDE_DIRS
+    JSONCPP_INCLUDE_DIR
     JSONCPP_LIBRARIES
 )

CMake/generate.conf

@@ -56,7 +56,7 @@ find: Graphviz
 [CMake:Deps:json]
 link: ${JSONCPP_LIBRARIES}
-include: ${jsoncpp_INCLUDE_DIRS}
+include: ${JSONCPP_INCLUDE_DIR}
 find: jsoncpp REQUIRED
 [CMake:Deps:readline]