From 951e2f9ce06a44fa85d07eaf2fcf3c19c99f3393 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Sun, 25 Nov 2018 12:03:43 +0100
Subject: [PATCH] CMake: fix jsoncpp includes
---
CMake/Findjsoncpp.cmake | 6 +++---
CMake/generate.conf | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMake/Findjsoncpp.cmake b/CMake/Findjsoncpp.cmake
index 416c1061d9..370e2e3ca9 100644
--- a/CMake/Findjsoncpp.cmake
+++ b/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
)
diff --git a/CMake/generate.conf b/CMake/generate.conf
index a45d50ea69..f6582191cb 100644
--- a/CMake/generate.conf
+++ b/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]
--
GitLab