Move rapidjson submodule to aux directory

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

.gitmodules

@@ -31,3 +31,6 @@
 [submodule "aux/paraglob"]
 	path = aux/paraglob
 	url = https://github.com/zeek/paraglob
+[submodule "aux/rapidjson"]
+	path = aux/rapidjson
+	url = https://github.com/zeek/rapidjson

CMakeLists.txt

@@ -263,6 +263,7 @@ endif ()
 set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
 include_directories(BEFORE ${broker_includes} ${CAF_INCLUDE_DIRS})
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob/include)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/rapidjson/include)
 include_directories(BEFORE
                     ${PCAP_INCLUDE_DIR}
                     ${BIND_INCLUDE_DIR}
@@ -271,6 +272,9 @@ include_directories(BEFORE
                     ${JEMALLOC_INCLUDE_DIR}
 )
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/aux/rapidjson/include/rapidjson
+        DESTINATION include/zeek/3rdparty/rapidjson/include)
+
 # Optional Dependencies
 
 set(USE_GEOIP false)

aux/rapidjson

@@ -0,0 +1 @@
+Subproject commit dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1

cmake

@@ -1 +1 @@
-Subproject commit 5174417e539fb610074ee2367370bd6988bd2281
+Subproject commit 141030e593b03c1cb9879d713aa90a3b8b16f0f9

src/3rdparty

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

src/CMakeLists.txt

@@ -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
 

src/supervisor/Supervisor.cc

@@ -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"

src/threading/formatters/JSON.cc

@@ -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"
 

src/threading/formatters/JSON.h

@@ -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"