Merge remote-tracking branch 'upstream/pr/271' into pulls

Handle alternate location for jsonc library Grive#271
mMerlin · Apr 12, 2015 · 9602c04 · 9602c04
2 parents 233a9b3 + 4fb10d7
commit 9602c04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cmake/Modules/FindJSONC.cmake b/cmake/Modules/FindJSONC.cmake
@@ -6,8 +6,8 @@
 #  JSONC_INCLUDE_DIR - The JSON-C include directory.
 #  JSONC_LIBRARY     - The JSON-C library to link against.
 
-FIND_PATH(JSONC_INCLUDE_DIR json/json.h)
-FIND_LIBRARY(JSONC_LIBRARY NAMES json)
+FIND_PATH(JSONC_INCLUDE_DIR json.h PATH_SUFFIXES json json-c)
+FIND_LIBRARY(JSONC_LIBRARY NAMES json json-c)
 
 IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
    SET(JSONC_FOUND TRUE)

diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt
@@ -43,6 +43,7 @@ include_directories(
 	${libgrive_SOURCE_DIR}/test
 	${GDBM_INCLUDE_DIR}
 	${YAJL_INCLUDE_DIR}
+	${JSONC_INCLUDE_DIR}
 	${OPT_INCS}
 )
 

diff --git a/libgrive/src/protocol/Json.cc b/libgrive/src/protocol/Json.cc
@@ -29,8 +29,8 @@
 	#pragma warning(push)
 	#pragma warning(disable: 4005)
 #endif
-#include <json/json_tokener.h>
-#include <json/linkhash.h>
+#include <json_tokener.h>
+#include <linkhash.h>
 #ifdef _MSC_VER
 	#pragma warning(pop)
 #endif