[build] Use rapidjson from mapbox-base

4 files changed, 36 insertions, 57 deletions

diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json
index 5cacfdcb7e..3922c28e0a 100644
--- a/vendor/mapbox-base-files.json
+++ b/vendor/mapbox-base-files.json
@@ -9,6 +9,42 @@
         "ghc/fs_std_fwd.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_std_fwd.hpp",
         "ghc/fs_std_impl.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_std_impl.hpp",
         "kdbush.hpp": "vendor/mapbox-base/extras/kdbush.hpp/include/kdbush.hpp",
+        "rapidjson/allocators.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/allocators.h",
+        "rapidjson/cursorstreamwrapper.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/cursorstreamwrapper.h",
+        "rapidjson/document.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/document.h",
+        "rapidjson/encodedstream.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/encodedstream.h",
+        "rapidjson/encodings.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/encodings.h",
+        "rapidjson/error/en.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/error/en.h",
+        "rapidjson/error/error.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/error/error.h",
+        "rapidjson/filereadstream.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/filereadstream.h",
+        "rapidjson/filewritestream.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/filewritestream.h",
+        "rapidjson/fwd.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/fwd.h",
+        "rapidjson/internal/biginteger.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/biginteger.h",
+        "rapidjson/internal/diyfp.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/diyfp.h",
+        "rapidjson/internal/dtoa.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/dtoa.h",
+        "rapidjson/internal/ieee754.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/ieee754.h",
+        "rapidjson/internal/itoa.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/itoa.h",
+        "rapidjson/internal/meta.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/meta.h",
+        "rapidjson/internal/pow10.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/pow10.h",
+        "rapidjson/internal/regex.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/regex.h",
+        "rapidjson/internal/stack.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/stack.h",
+        "rapidjson/internal/strfunc.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/strfunc.h",
+        "rapidjson/internal/strtod.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/strtod.h",
+        "rapidjson/internal/swap.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/internal/swap.h",
+        "rapidjson/istreamwrapper.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/istreamwrapper.h",
+        "rapidjson/memorybuffer.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/memorybuffer.h",
+        "rapidjson/memorystream.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/memorystream.h",
+        "rapidjson/msinttypes/inttypes.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/msinttypes/inttypes.h",
+        "rapidjson/msinttypes/stdint.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/msinttypes/stdint.h",
+        "rapidjson/ostreamwrapper.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/ostreamwrapper.h",
+        "rapidjson/pointer.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/pointer.h",
+        "rapidjson/prettywriter.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/prettywriter.h",
+        "rapidjson/rapidjson.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/rapidjson.h",
+        "rapidjson/reader.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/reader.h",
+        "rapidjson/schema.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/schema.h",
+        "rapidjson/stream.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/stream.h",
+        "rapidjson/stringbuffer.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/stringbuffer.h",
+        "rapidjson/writer.h": "vendor/mapbox-base/extras/rapidjson/include/rapidjson/writer.h",
         "mapbox/geojson.hpp": "vendor/mapbox-base/mapbox/geojson.hpp/include/mapbox/geojson.hpp",
         "mapbox/geojson/rapidjson.hpp": "vendor/mapbox-base/mapbox/geojson.hpp/include/mapbox/geojson/rapidjson.hpp",
         "mapbox/geojson_impl.hpp": "vendor/mapbox-base/mapbox/geojson.hpp/include/mapbox/geojson_impl.hpp",
diff --git a/vendor/rapidjson b/vendor/rapidjson
deleted file mode 160000
-Subproject f54b0e47a08782a6131cc3d60f94d038fa6e0a5
diff --git a/vendor/rapidjson-files.json b/vendor/rapidjson-files.json
deleted file mode 100644
index 1d3a454083..0000000000
--- a/vendor/rapidjson-files.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
-    "sources": [],
-    "public_headers": {
-        "rapidjson/allocators.h": "vendor/rapidjson/include/rapidjson/allocators.h",
-        "rapidjson/document.h": "vendor/rapidjson/include/rapidjson/document.h",
-        "rapidjson/encodedstream.h": "vendor/rapidjson/include/rapidjson/encodedstream.h",
-        "rapidjson/encodings.h": "vendor/rapidjson/include/rapidjson/encodings.h",
-        "rapidjson/error/en.h": "vendor/rapidjson/include/rapidjson/error/en.h",
-        "rapidjson/error/error.h": "vendor/rapidjson/include/rapidjson/error/error.h",
-        "rapidjson/filereadstream.h": "vendor/rapidjson/include/rapidjson/filereadstream.h",
-        "rapidjson/filewritestream.h": "vendor/rapidjson/include/rapidjson/filewritestream.h",
-        "rapidjson/fwd.h": "vendor/rapidjson/include/rapidjson/fwd.h",
-        "rapidjson/internal/biginteger.h": "vendor/rapidjson/include/rapidjson/internal/biginteger.h",
-        "rapidjson/internal/diyfp.h": "vendor/rapidjson/include/rapidjson/internal/diyfp.h",
-        "rapidjson/internal/dtoa.h": "vendor/rapidjson/include/rapidjson/internal/dtoa.h",
-        "rapidjson/internal/ieee754.h": "vendor/rapidjson/include/rapidjson/internal/ieee754.h",
-        "rapidjson/internal/itoa.h": "vendor/rapidjson/include/rapidjson/internal/itoa.h",
-        "rapidjson/internal/meta.h": "vendor/rapidjson/include/rapidjson/internal/meta.h",
-        "rapidjson/internal/pow10.h": "vendor/rapidjson/include/rapidjson/internal/pow10.h",
-        "rapidjson/internal/regex.h": "vendor/rapidjson/include/rapidjson/internal/regex.h",
-        "rapidjson/internal/stack.h": "vendor/rapidjson/include/rapidjson/internal/stack.h",
-        "rapidjson/internal/strfunc.h": "vendor/rapidjson/include/rapidjson/internal/strfunc.h",
-        "rapidjson/internal/strtod.h": "vendor/rapidjson/include/rapidjson/internal/strtod.h",
-        "rapidjson/internal/swap.h": "vendor/rapidjson/include/rapidjson/internal/swap.h",
-        "rapidjson/istreamwrapper.h": "vendor/rapidjson/include/rapidjson/istreamwrapper.h",
-        "rapidjson/memorybuffer.h": "vendor/rapidjson/include/rapidjson/memorybuffer.h",
-        "rapidjson/memorystream.h": "vendor/rapidjson/include/rapidjson/memorystream.h",
-        "rapidjson/msinttypes/inttypes.h": "vendor/rapidjson/include/rapidjson/msinttypes/inttypes.h",
-        "rapidjson/msinttypes/stdint.h": "vendor/rapidjson/include/rapidjson/msinttypes/stdint.h",
-        "rapidjson/ostreamwrapper.h": "vendor/rapidjson/include/rapidjson/ostreamwrapper.h",
-        "rapidjson/pointer.h": "vendor/rapidjson/include/rapidjson/pointer.h",
-        "rapidjson/prettywriter.h": "vendor/rapidjson/include/rapidjson/prettywriter.h",
-        "rapidjson/rapidjson.h": "vendor/rapidjson/include/rapidjson/rapidjson.h",
-        "rapidjson/reader.h": "vendor/rapidjson/include/rapidjson/reader.h",
-        "rapidjson/schema.h": "vendor/rapidjson/include/rapidjson/schema.h",
-        "rapidjson/stream.h": "vendor/rapidjson/include/rapidjson/stream.h",
-        "rapidjson/stringbuffer.h": "vendor/rapidjson/include/rapidjson/stringbuffer.h",
-        "rapidjson/writer.h": "vendor/rapidjson/include/rapidjson/writer.h"
-    },
-    "private_headers": {}
-}
diff --git a/vendor/rapidjson.cmake b/vendor/rapidjson.cmake
deleted file mode 100644
index 40b5c31895..0000000000
--- a/vendor/rapidjson.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-add_library(rapidjson INTERFACE)
-
-target_include_directories(rapidjson SYSTEM INTERFACE
-    ${CMAKE_SOURCE_DIR}/vendor/rapidjson/include
-)
-
-target_compile_definitions(rapidjson INTERFACE
-    RAPIDJSON_HAS_STDSTRING=1
-)
-
-if(WIN32)
-    target_compile_definitions(rapidjson INTERFACE
-        RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    )
-endif()