tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Use rapidjson from mapbox-base

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-08-30 16:29:13 +03:00
parent 02c9918b83
commit 26ea9798b7
10 changed files with 51 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -7,9 +7,6 @@
[submodule "vendor/nunicode"]
path = vendor/nunicode
url = https://bitbucket.org/alekseyt/nunicode.git
[submodule "vendor/rapidjson"]
path = vendor/rapidjson
url = https://github.com/Tencent/rapidjson.git
[submodule "vendor/earcut.hpp"]
path = vendor/earcut.hpp
url = https://github.com/mapbox/earcut.hpp.git

2
cmake/core.cmake
View File

@@ -31,7 +31,7 @@ target_link_libraries(mbgl-core PUBLIC
${ICU_LIBRARY}
polylabel
protozero
rapidjson
Mapbox::Base::Extras::rapidjson
vector-tile
)

2
cmake/render-test.cmake
View File

@@ -24,7 +24,7 @@ target_link_libraries(mbgl-render-test PRIVATE
expected
Mapbox::Base::Extras::filesystem
Mapbox::Base::pixelmatch-cpp
rapidjson
Mapbox::Base::Extras::rapidjson
)
add_definitions(-DTEST_RUNNER_ROOT_PATH="${CMAKE_SOURCE_DIR}")

12
cmake/vendor.cmake
View File

@@ -15,7 +15,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake)
@@ -25,6 +24,17 @@ if(NOT TARGET mapbox-base)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base)
endif()
target_compile_definitions(mapbox-base-extras-rapidjson INTERFACE
RAPIDJSON_HAS_STDSTRING=1
)
if(WIN32)
target_compile_definitions(mapbox-base-extras-rapidjson INTERFACE
RAPIDJSON_HAS_CXX11_RVALUE_REFS
)
endif()
if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos")
include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake)
endif()

1
misc/buck/mapbox-gl-native/BUCK
View File

@@ -48,7 +48,6 @@ mbgl_vendor_library("mapbox-base")
mbgl_vendor_library("sqlite")
mbgl_vendor_library("polylabel")
mbgl_vendor_library("protozero")
mbgl_vendor_library("rapidjson")
mbgl_vendor_library("shelf-pack-cpp")
mbgl_vendor_library("unique_resource")
mbgl_vendor_library("vector-tile")

4
scripts/generate-file-lists.js
View File

@@ -136,6 +136,7 @@ generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "incl
generateFileList('vendor/mapbox-base-files.json',
[ 'vendor/mapbox-base/extras/kdbush.hpp',
'vendor/mapbox-base/extras/filesystem',
'vendor/mapbox-base/extras/rapidjson',
'vendor/mapbox-base/mapbox/pixelmatch-cpp',
'vendor/mapbox-base/mapbox/geometry.hpp',
'vendor/mapbox-base/mapbox/variant',
@@ -143,10 +144,9 @@ generateFileList('vendor/mapbox-base-files.json',
'vendor/mapbox-base/mapbox/supercluster.hpp',
'vendor/mapbox-base/mapbox/geojson.hpp',
'vendor/mapbox-base/mapbox/jni.hpp' ],
vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp", ":!:include/jni/string_conversion.hpp" ]);
vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "include/**/*.h", "optional.hpp", ":!:include/jni/string_conversion.hpp" ]);
generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/rapidjson-files.json', [ 'vendor/rapidjson' ], vendorRegex, [ "include/**/*.h" ]);
generateFileList('vendor/shelf-pack-cpp-files.json', [ 'vendor/shelf-pack-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/sqlite-files.json', [ 'vendor/sqlite' ], vendorRegex, [ "include/*.h", "src/*.c" ]);
generateFileList('vendor/unique_resource-files.json', [ 'vendor/unique_resource' ], vendorRegex, [ "unique_resource.hpp" ]);

36
vendor/mapbox-base-files.json vendored
View File

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

1
vendor/rapidjson vendored

Submodule vendor/rapidjson deleted from f54b0e47a0

42
vendor/rapidjson-files.json vendored
View File

@@ -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": {}
}

15
vendor/rapidjson.cmake vendored
View File

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