(ws) #125 / cmake detects an already installed jsoncpp and will try to use this one if present

2019-12-03 16:01:46 -08:00
parent 2e1657167f
commit 5c5ea6dec1
16 changed files with 60 additions and 12 deletions
--- a/ixcobra/CMakeLists.txt
+++ b/ixcobra/CMakeLists.txt
@ -24,7 +24,6 @@ set(IXCOBRA_INCLUDE_DIRS
    .
    ..
    ../ixcore
-    ../ixcrypto
-    ../third_party)
+    ../ixcrypto)

 target_include_directories( ixcobra PUBLIC ${IXCOBRA_INCLUDE_DIRS} )
--- a/ixcobra/ixcobra/IXCobraConnection.cpp
+++ b/ixcobra/ixcobra/IXCobraConnection.cpp
@ -14,6 +14,7 @@
 #include <cassert>
 #include <cstring>
 #include <iostream>
+#include <sstream>


 namespace ix
--- a/ixcobra/ixcobra/IXCobraConnection.h
+++ b/ixcobra/ixcobra/IXCobraConnection.h
@ -8,7 +8,7 @@

 #include <ixwebsocket/IXWebSocketHttpHeaders.h>
 #include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <memory>
 #include <mutex>
 #include <queue>
--- a/ixcobra/ixcobra/IXCobraMetricsPublisher.h
+++ b/ixcobra/ixcobra/IXCobraMetricsPublisher.h
@ -9,7 +9,7 @@
 #include "IXCobraMetricsThreadedPublisher.h"
 #include <atomic>
 #include <chrono>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <string>
 #include <unordered_map>

--- a/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp
+++ b/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp
@ -13,6 +13,7 @@
 #include <cmath>
 #include <cassert>
 #include <iostream>
+#include <sstream>


 namespace ix
--- a/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.h
+++ b/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.h
@ -9,7 +9,7 @@
 #include "IXCobraConnection.h"
 #include <atomic>
 #include <condition_variable>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <map>
 #include <mutex>
 #include <queue>