tjh.dev
1diff --git i/cyacas/yacas-kernel/CMakeLists.txt w/cyacas/yacas-kernel/CMakeLists.txt
2index fe1600aa..dcc329f8 100644
3--- i/cyacas/yacas-kernel/CMakeLists.txt
4+++ w/cyacas/yacas-kernel/CMakeLists.txt
5@@ -22,8 +22,9 @@ find_library (ZEROMQ_LIBRARY NAMES zmq)
6 find_path (ZMQPP_INCLUDE_DIR zmqpp.hpp)
7 find_library (ZMQPP_LIBRARY NAMES zmqpp)
8
9-find_path (JSONCPP_INCLUDE_DIR json.h)
10-find_library (JSONCPP_LIBRARY NAMES jsoncpp)
11+# https://github.com/open-source-parsers/jsoncpp/wiki/Building#another-approach-for-cmake
12+find_package(jsoncpp REQUIRED)
13+get_target_property(JSON_INC_PATH jsoncpp_lib INTERFACE_INCLUDE_DIRECTORIES)
14
15 find_package (OpenSSL)
16 find_package (Boost REQUIRED date_time filesystem)
17@@ -31,6 +32,6 @@ find_package (Boost REQUIRED date_time filesystem)
18 include_directories (include)
19
20 add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp src/base64.cpp)
21-target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS})
22+target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} jsoncpp_lib ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS})
23
24 install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR})
25diff --git i/cyacas/yacas-kernel/include/yacas_kernel.hpp w/cyacas/yacas-kernel/include/yacas_kernel.hpp
26index 91d36ac0..d12f905c 100644
27--- i/cyacas/yacas-kernel/include/yacas_kernel.hpp
28+++ w/cyacas/yacas-kernel/include/yacas_kernel.hpp
29@@ -29,7 +29,7 @@
30 #include "yacas_engine.hpp"
31
32 #include <boost/uuid/random_generator.hpp>
33-#include <jsoncpp/json/json.h>
34+#include <json/json.h>
35 #include <zmqpp/zmqpp.hpp>
36
37 #include <map>
38diff --git i/cyacas/yacas-kernel/src/main.cpp w/cyacas/yacas-kernel/src/main.cpp
39index c31f17f2..832e9128 100644
40--- i/cyacas/yacas-kernel/src/main.cpp
41+++ w/cyacas/yacas-kernel/src/main.cpp
42@@ -24,7 +24,7 @@
43
44 #include "yacas_kernel.hpp"
45
46-#include <jsoncpp/json/json.h>
47+#include <json/json.h>
48
49 #include <boost/dll/runtime_symbol_info.hpp>
50
51diff --git i/cyacas/yacas-kernel/src/yacas_engine.cpp w/cyacas/yacas-kernel/src/yacas_engine.cpp
52index 6ed60ca3..18e9b3fd 100644
53--- i/cyacas/yacas-kernel/src/yacas_engine.cpp
54+++ w/cyacas/yacas-kernel/src/yacas_engine.cpp
55@@ -22,7 +22,7 @@
56 * Created on November 7, 2015, 12:52 PM
57 */
58
59-#include <jsoncpp/json/writer.h>
60+#include <json/writer.h>
61
62 #include "yacas_engine.hpp"
63