浏览代码

Include dir for jsoncpp

anon 5 年之前
父节点
当前提交
45dc651c5e
共有 6 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      cli/CMakeLists.txt
  2. 1 1
      cli/src/iomanager.cpp
  3. 1 1
      cli/src/machineiomanager.cpp
  4. 1 1
      cli/src/useriomanager.cpp
  5. 1 1
      daemon/CMakeLists.txt
  6. 1 1
      daemon/src/Server.cpp

+ 1 - 1
cli/CMakeLists.txt

@@ -16,6 +16,6 @@ find_package(Threads)
 find_package(Boost 1.67 REQUIRED COMPONENTS system program_options)
 
 
-include_directories(${Boost_INCLUDE_DIR} include)
+include_directories(${Boost_INCLUDE_DIR} ${JSONCPP_INCLUDEDIR} include)
 
 target_link_libraries(ccats-cli PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} ${READLINE_LIBRARIES} ${JSONCPP_LIBRARIES})

+ 1 - 1
cli/src/iomanager.cpp

@@ -1,7 +1,7 @@
 #include "../include/iomanager.hpp"
 
 #include <iostream>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 
 using boost::asio::buffer;
 

+ 1 - 1
cli/src/machineiomanager.cpp

@@ -2,7 +2,7 @@
 #include "../include/commands.hpp"
 
 #include <iostream>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 
 #include <readline/readline.h>
 

+ 1 - 1
cli/src/useriomanager.cpp

@@ -2,7 +2,7 @@
 #include "../include/commands.hpp"
 
 #include <iostream>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 
 #include <readline/history.h>
 #include <readline/readline.h>

+ 1 - 1
daemon/CMakeLists.txt

@@ -17,5 +17,5 @@ find_package(Threads REQUIRED)
 find_package(Boost 1.67 REQUIRED COMPONENTS system)
 # find_package(libtins 4.2 REQUIRED)
 
-include_directories(${Boost_INCLUDE_DIR})
+include_directories(${Boost_INCLUDE_DIR} ${JSONCPP_INCLUDEDIR})
 target_link_libraries(ccats PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} ${TINS_LIBRARIES} ${PCAP_LIBRARIES} ${JSONCPP_LIBRARIES})

+ 1 - 1
daemon/src/Server.cpp

@@ -1,6 +1,6 @@
 #include "../include/Server.h"
 #include <iostream>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 
 using namespace boost::asio;
 using ip::tcp;