]>
Commit | Line | Data |
---|---|---|
a4743560 JR |
1 | --- grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/cmake/Modules/FindJSONC.cmake~ 2013-05-02 18:40:04.000000000 +0200 |
2 | +++ grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/cmake/Modules/FindJSONC.cmake 2013-12-04 01:11:58.326961184 +0100 | |
3 | @@ -6,8 +6,8 @@ | |
4 | # JSONC_INCLUDE_DIR - The JSON-C include directory. | |
5 | # JSONC_LIBRARY - The JSON-C library to link against. | |
6 | ||
7 | -FIND_PATH(JSONC_INCLUDE_DIR json/json.h) | |
8 | -FIND_LIBRARY(JSONC_LIBRARY NAMES json) | |
9 | +FIND_PATH(JSONC_INCLUDE_DIR json-c/json.h) | |
10 | +FIND_LIBRARY(JSONC_LIBRARY NAMES json-c) | |
11 | ||
12 | IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY) | |
13 | SET(JSONC_FOUND TRUE) | |
54a0f00e JR |
14 | --- grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/protocol/Json.cc~ 2013-05-02 18:40:04.000000000 +0200 |
15 | +++ grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/protocol/Json.cc 2015-02-18 18:11:40.664989070 +0100 | |
16 | @@ -29,8 +29,8 @@ | |
17 | #pragma warning(push) | |
18 | #pragma warning(disable: 4005) | |
19 | #endif | |
20 | -#include <json/json_tokener.h> | |
21 | -#include <json/linkhash.h> | |
22 | +#include <json-c/json_tokener.h> | |
23 | +#include <json-c/linkhash.h> | |
24 | #ifdef _MSC_VER | |
25 | #pragma warning(pop) | |
26 | #endif |