Skip to content

Commit 941dd70

Browse files
committed
Find jsoncpp headers in standard location
1 parent 7ad0837 commit 941dd70

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

cmake/FindJSONCPP.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FIND_PATH(JSONCPP_INCLUDE_DIRS json.h
1212
/usr/include
1313
/usr/local/include
1414
${CMAKE_SOURCE_DIR}/win32-deps/include
15-
PATH_SUFFIXES jsoncpp/json jsoncpp
15+
PATH_SUFFIXES jsoncpp/json jsoncpp json
1616
)
1717

1818

src/bitcoinapi/exception.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include <string>
1414
#include <sstream>
1515

16-
#include <jsoncpp/json/json.h>
17-
#include <jsoncpp/json/reader.h>
18-
#include <jsoncpp/json/value.h>
16+
#include <json/json.h>
17+
#include <json/reader.h>
18+
#include <json/value.h>
1919
#include <jsonrpccpp/client.h>
2020

2121
using Json::Value;
@@ -31,11 +31,11 @@ class BitcoinException: public std::exception
3131

3232
public:
3333
explicit BitcoinException(int errcode, const std::string& message) {
34-
34+
3535
/* Connection error */
3636
if(errcode == Errors::ERROR_CLIENT_CONNECTOR){
3737
this->code = errcode;
38-
this->msg = removePrefix(message, " -> ");
38+
this->msg = removePrefix(message, " -> ");
3939
/* Authentication error */
4040
}else if(errcode == Errors::ERROR_RPC_INTERNAL_ERROR && message.size() == 18){
4141
this->code = errcode;

src/bitcoinapi/types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <string>
1414
#include <vector>
1515

16-
#include <jsoncpp/json/json.h>
16+
#include <json/json.h>
1717

1818
/* === General types === */
1919
struct getinfo_t{

0 commit comments

Comments
 (0)