|
 |
4e6c532 |
From d41cada992ca0236e223ee6d10180fc53df64558 Mon Sep 17 00:00:00 2001
|
|
|
65c5dba |
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
65c5dba |
Date: Fri, 11 Oct 2013 03:29:03 +0400
|
|
|
4e6c532 |
Subject: [PATCH] FindJson.cmake now will correctly find system module
|
|
|
65c5dba |
|
|
|
65c5dba |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
65c5dba |
---
|
|
|
4e6c532 |
cmake/Modules/FindJson.cmake | 21 +++++++++++----------
|
|
|
4e6c532 |
1 file changed, 11 insertions(+), 10 deletions(-)
|
|
|
65c5dba |
|
|
|
65c5dba |
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
|
|
|
4e6c532 |
index a9178a2..2e64b4e 100644
|
|
|
65c5dba |
--- a/cmake/Modules/FindJson.cmake
|
|
|
65c5dba |
+++ b/cmake/Modules/FindJson.cmake
|
|
|
4e6c532 |
@@ -1,18 +1,19 @@
|
|
|
65c5dba |
# Look for json, use our own if not found
|
|
|
65c5dba |
|
|
|
65c5dba |
-#FIND_PATH(JSON_INCLUDE_DIR json.h)
|
|
|
65c5dba |
+FIND_PATH(JSON_INCLUDE_DIR json/features.h
|
|
|
65c5dba |
+ PATH_SUFFIXES jsoncpp)
|
|
|
65c5dba |
|
|
|
65c5dba |
-#FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp)
|
|
|
65c5dba |
+FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp)
|
|
|
65c5dba |
|
|
|
65c5dba |
-#IF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
|
|
|
65c5dba |
-# SET( JSON_FOUND TRUE )
|
|
|
65c5dba |
-#ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
|
|
|
65c5dba |
+IF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
|
|
|
65c5dba |
+ SET(JSON_FOUND TRUE)
|
|
|
65c5dba |
+ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
|
|
|
65c5dba |
|
|
|
65c5dba |
-#IF(JSON_FOUND)
|
|
|
65c5dba |
-# MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}")
|
|
|
65c5dba |
-# MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}")
|
|
|
65c5dba |
-#ELSE(JSON_FOUND)
|
|
|
65c5dba |
+IF(JSON_FOUND)
|
|
|
65c5dba |
+ MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}")
|
|
|
65c5dba |
+ MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}")
|
|
|
65c5dba |
+ELSE(JSON_FOUND)
|
|
|
65c5dba |
SET(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json)
|
|
|
65c5dba |
SET(JSON_LIBRARY jsoncpp)
|
|
|
65c5dba |
MESSAGE(STATUS "Using project jsoncpp library")
|
|
|
65c5dba |
-#ENDIF(JSON_FOUND)
|
|
|
65c5dba |
+ENDIF(JSON_FOUND)
|
|
|
65c5dba |
--
|
|
|
4e6c532 |
1.8.4.2
|
|
|
65c5dba |
|