Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move rapidjson submodule to aux directory

Browse source 
This also now installs the full rapidjson include/ tree in order to
allow external plugins to properly build if they include
threading/formatters/JSON.h
This commit is contained in:
Jon Siwek 2020-03-05 19:24:13 -08:00
parent 9a8fa25002
commit ba9c06fc2b
9 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/3rdparty

@ -1 +1 @@
Subproject commit 1bbf93e6027f686eda7ab7f36036cd1236c917fe
Subproject commit 731fd6de1804ccee12fdef84a8b13d6f9718dc11

6
src/CMakeLists.txt
View file

@ -427,12 +427,6 @@ install(FILES
DESTINATION include/zeek/3rdparty
)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/rapidjson/include/rapidjson/document.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/rapidjson/include/rapidjson/writer.h
DESTINATION include/zeek/3rdparty/rapidjson/include/rapidjson
)
########################################################################
## Clang-tidy target now that we have all of the sources

2
src/supervisor/Supervisor.cc
View file

@ -29,7 +29,7 @@
#include "zeek-affinity.h"
#define RAPIDJSON_HAS_STDSTRING 1
#include "3rdparty/rapidjson/include/rapidjson/document.h"
#include "rapidjson/document.h"
extern "C" {
#include "setsignal.h"

2
src/threading/formatters/JSON.cc
View file

@ -3,7 +3,7 @@
#include "zeek-config.h"
#include "JSON.h"
#include "3rdparty/rapidjson/include/rapidjson/internal/ieee754.h"
#include "rapidjson/internal/ieee754.h"
#include "Desc.h"
#include "threading/MsgThread.h"

4
src/threading/formatters/JSON.h
View file

@ -3,8 +3,8 @@
#pragma once
#define RAPIDJSON_HAS_STDSTRING 1
#include "3rdparty/rapidjson/include/rapidjson/document.h"
#include "3rdparty/rapidjson/include/rapidjson/writer.h"
#include "rapidjson/document.h"
#include "rapidjson/writer.h"
#include "../Formatter.h"