(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/ixsentry/CMakeLists.txt
+++ b/ixsentry/CMakeLists.txt
@ -19,7 +19,6 @@ add_library(ixsentry STATIC
 set(IXSENTRY_INCLUDE_DIRS
    .
    ..
-    ../ixcore
-    ../third_party)
+    ../ixcore)

 target_include_directories( ixsentry PUBLIC ${IXSENTRY_INCLUDE_DIRS} )
--- a/ixsentry/ixsentry/IXSentryClient.cpp
+++ b/ixsentry/ixsentry/IXSentryClient.cpp
@ -9,6 +9,7 @@
 #include <chrono>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 #include <ixwebsocket/IXWebSocketHttpHeaders.h>
 #include <ixcore/utils/IXCoreLogger.h>

--- a/ixsentry/ixsentry/IXSentryClient.h
+++ b/ixsentry/ixsentry/IXSentryClient.h
@ -8,7 +8,7 @@

 #include <algorithm>
 #include <ixwebsocket/IXHttpClient.h>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <regex>
 #include <memory>