diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/benchmark-files.cmake | 1 | ||||
| -rw-r--r-- | cmake/benchmark.cmake | 2 | ||||
| -rw-r--r-- | cmake/core-files.cmake | 155 | ||||
| -rw-r--r-- | cmake/core.cmake | 2 | ||||
| -rw-r--r-- | cmake/glfw.cmake | 4 | ||||
| -rw-r--r-- | cmake/loop-uv.cmake | 4 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 6 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 14 | ||||
| -rw-r--r-- | cmake/test.cmake | 1 |
9 files changed, 117 insertions, 72 deletions
diff --git a/cmake/benchmark-files.cmake b/cmake/benchmark-files.cmake index 0306340fe0..3736df11f6 100644 --- a/cmake/benchmark-files.cmake +++ b/cmake/benchmark-files.cmake @@ -9,6 +9,7 @@ set(MBGL_BENCHMARK_FILES # parse benchmark/parse/filter.benchmark.cpp + benchmark/parse/vector_tile.benchmark.cpp # src benchmark/src/main.cpp diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index c298d8ee28..f4c59fa01e 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -19,6 +19,8 @@ target_link_libraries(mbgl-benchmark target_add_mason_package(mbgl-benchmark PRIVATE benchmark) target_add_mason_package(mbgl-benchmark PRIVATE rapidjson) +target_add_mason_package(mbgl-benchmark PRIVATE protozero) +target_add_mason_package(mbgl-benchmark PRIVATE vector-tile) mbgl_platform_benchmark() diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 069b6cb4c9..fc476fcd15 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -2,12 +2,12 @@ set(MBGL_CORE_FILES # actor + include/mbgl/actor/actor.hpp + include/mbgl/actor/actor_ref.hpp include/mbgl/actor/mailbox.hpp + include/mbgl/actor/message.hpp include/mbgl/actor/scheduler.hpp - src/mbgl/actor/actor.hpp - src/mbgl/actor/actor_ref.hpp src/mbgl/actor/mailbox.cpp - src/mbgl/actor/message.hpp # algorithm src/mbgl/algorithm/covered_by_children.hpp @@ -32,8 +32,6 @@ set(MBGL_CORE_FILES src/mbgl/annotation/render_annotation_source.hpp src/mbgl/annotation/shape_annotation_impl.cpp src/mbgl/annotation/shape_annotation_impl.hpp - src/mbgl/annotation/style_sourced_annotation_impl.cpp - src/mbgl/annotation/style_sourced_annotation_impl.hpp src/mbgl/annotation/symbol_annotation_impl.cpp src/mbgl/annotation/symbol_annotation_impl.hpp @@ -43,7 +41,6 @@ set(MBGL_CORE_FILES # geometry src/mbgl/geometry/anchor.hpp - src/mbgl/geometry/binpack.hpp src/mbgl/geometry/debug_font_data.hpp src/mbgl/geometry/feature_index.cpp src/mbgl/geometry/feature_index.hpp @@ -163,81 +160,97 @@ set(MBGL_CORE_FILES src/mbgl/renderer/bucket.hpp src/mbgl/renderer/bucket_parameters.cpp src/mbgl/renderer/bucket_parameters.hpp - src/mbgl/renderer/cascade_parameters.hpp - src/mbgl/renderer/circle_bucket.cpp - src/mbgl/renderer/circle_bucket.hpp src/mbgl/renderer/cross_faded_property_evaluator.cpp src/mbgl/renderer/cross_faded_property_evaluator.hpp src/mbgl/renderer/data_driven_property_evaluator.hpp - src/mbgl/renderer/debug_bucket.cpp - src/mbgl/renderer/debug_bucket.hpp - src/mbgl/renderer/fill_bucket.cpp - src/mbgl/renderer/fill_bucket.hpp - src/mbgl/renderer/fill_extrusion_bucket.cpp - src/mbgl/renderer/fill_extrusion_bucket.hpp src/mbgl/renderer/frame_history.cpp src/mbgl/renderer/frame_history.hpp src/mbgl/renderer/group_by_layout.cpp src/mbgl/renderer/group_by_layout.hpp - src/mbgl/renderer/line_bucket.cpp - src/mbgl/renderer/line_bucket.hpp + src/mbgl/renderer/image_atlas.cpp + src/mbgl/renderer/image_atlas.hpp + src/mbgl/renderer/image_manager.cpp + src/mbgl/renderer/image_manager.hpp src/mbgl/renderer/paint_parameters.hpp src/mbgl/renderer/paint_property_binder.hpp src/mbgl/renderer/paint_property_statistics.hpp src/mbgl/renderer/painter.cpp src/mbgl/renderer/painter.hpp - src/mbgl/renderer/painter_background.cpp - src/mbgl/renderer/painter_circle.cpp - src/mbgl/renderer/painter_clipping.cpp - src/mbgl/renderer/painter_debug.cpp - src/mbgl/renderer/painter_fill.cpp - src/mbgl/renderer/painter_fill_extrusion.cpp - src/mbgl/renderer/painter_line.cpp - src/mbgl/renderer/painter_raster.cpp - src/mbgl/renderer/painter_symbol.cpp src/mbgl/renderer/possibly_evaluated_property_value.hpp src/mbgl/renderer/property_evaluation_parameters.hpp src/mbgl/renderer/property_evaluator.hpp - src/mbgl/renderer/raster_bucket.cpp - src/mbgl/renderer/raster_bucket.hpp - src/mbgl/renderer/render_background_layer.cpp - src/mbgl/renderer/render_background_layer.hpp - src/mbgl/renderer/render_circle_layer.cpp - src/mbgl/renderer/render_circle_layer.hpp - src/mbgl/renderer/render_custom_layer.cpp - src/mbgl/renderer/render_custom_layer.hpp - src/mbgl/renderer/render_fill_extrusion_layer.cpp - src/mbgl/renderer/render_fill_extrusion_layer.hpp - src/mbgl/renderer/render_fill_layer.cpp - src/mbgl/renderer/render_fill_layer.hpp src/mbgl/renderer/render_item.hpp src/mbgl/renderer/render_layer.cpp src/mbgl/renderer/render_layer.hpp src/mbgl/renderer/render_light.cpp src/mbgl/renderer/render_light.hpp - src/mbgl/renderer/render_line_layer.cpp - src/mbgl/renderer/render_line_layer.hpp src/mbgl/renderer/render_pass.hpp - src/mbgl/renderer/render_raster_layer.cpp - src/mbgl/renderer/render_raster_layer.hpp src/mbgl/renderer/render_source.cpp src/mbgl/renderer/render_source.hpp src/mbgl/renderer/render_source_observer.hpp - src/mbgl/renderer/render_symbol_layer.cpp - src/mbgl/renderer/render_symbol_layer.hpp + src/mbgl/renderer/render_style.cpp + src/mbgl/renderer/render_style.hpp + src/mbgl/renderer/render_style_observer.hpp src/mbgl/renderer/render_tile.cpp src/mbgl/renderer/render_tile.hpp - src/mbgl/renderer/symbol_bucket.cpp - src/mbgl/renderer/symbol_bucket.hpp + src/mbgl/renderer/style_diff.cpp + src/mbgl/renderer/style_diff.hpp src/mbgl/renderer/tile_parameters.hpp src/mbgl/renderer/tile_pyramid.cpp src/mbgl/renderer/tile_pyramid.hpp - src/mbgl/renderer/transitioning_property.hpp + src/mbgl/renderer/transition_parameters.hpp src/mbgl/renderer/update_parameters.hpp + # renderer/buckets + src/mbgl/renderer/buckets/circle_bucket.cpp + src/mbgl/renderer/buckets/circle_bucket.hpp + src/mbgl/renderer/buckets/debug_bucket.cpp + src/mbgl/renderer/buckets/debug_bucket.hpp + src/mbgl/renderer/buckets/fill_bucket.cpp + src/mbgl/renderer/buckets/fill_bucket.hpp + src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp + src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp + src/mbgl/renderer/buckets/line_bucket.cpp + src/mbgl/renderer/buckets/line_bucket.hpp + src/mbgl/renderer/buckets/raster_bucket.cpp + src/mbgl/renderer/buckets/raster_bucket.hpp + src/mbgl/renderer/buckets/symbol_bucket.cpp + src/mbgl/renderer/buckets/symbol_bucket.hpp + + # renderer/layers + src/mbgl/renderer/layers/render_background_layer.cpp + src/mbgl/renderer/layers/render_background_layer.hpp + src/mbgl/renderer/layers/render_circle_layer.cpp + src/mbgl/renderer/layers/render_circle_layer.hpp + src/mbgl/renderer/layers/render_custom_layer.cpp + src/mbgl/renderer/layers/render_custom_layer.hpp + src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp + src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp + src/mbgl/renderer/layers/render_fill_layer.cpp + src/mbgl/renderer/layers/render_fill_layer.hpp + src/mbgl/renderer/layers/render_line_layer.cpp + src/mbgl/renderer/layers/render_line_layer.hpp + src/mbgl/renderer/layers/render_raster_layer.cpp + src/mbgl/renderer/layers/render_raster_layer.hpp + src/mbgl/renderer/layers/render_symbol_layer.cpp + src/mbgl/renderer/layers/render_symbol_layer.hpp + + # renderer/painters + src/mbgl/renderer/painters/painter_background.cpp + src/mbgl/renderer/painters/painter_circle.cpp + src/mbgl/renderer/painters/painter_clipping.cpp + src/mbgl/renderer/painters/painter_debug.cpp + src/mbgl/renderer/painters/painter_fill.cpp + src/mbgl/renderer/painters/painter_fill_extrusion.cpp + src/mbgl/renderer/painters/painter_line.cpp + src/mbgl/renderer/painters/painter_raster.cpp + src/mbgl/renderer/painters/painter_symbol.cpp + # renderer/sources src/mbgl/renderer/sources/render_geojson_source.cpp src/mbgl/renderer/sources/render_geojson_source.hpp + src/mbgl/renderer/sources/render_image_source.cpp + src/mbgl/renderer/sources/render_image_source.hpp src/mbgl/renderer/sources/render_raster_source.cpp src/mbgl/renderer/sources/render_raster_source.hpp src/mbgl/renderer/sources/render_vector_source.cpp @@ -282,11 +295,11 @@ set(MBGL_CORE_FILES src/mbgl/shaders/symbol_sdf.hpp # sprite - src/mbgl/sprite/sprite_atlas.cpp - src/mbgl/sprite/sprite_atlas.hpp - src/mbgl/sprite/sprite_atlas_observer.hpp - src/mbgl/sprite/sprite_atlas_worker.cpp - src/mbgl/sprite/sprite_atlas_worker.hpp + src/mbgl/sprite/sprite_loader.cpp + src/mbgl/sprite/sprite_loader.hpp + src/mbgl/sprite/sprite_loader_observer.hpp + src/mbgl/sprite/sprite_loader_worker.cpp + src/mbgl/sprite/sprite_loader_worker.hpp src/mbgl/sprite/sprite_parser.cpp src/mbgl/sprite/sprite_parser.hpp @@ -297,12 +310,16 @@ set(MBGL_CORE_FILES include/mbgl/storage/offline.hpp include/mbgl/storage/online_file_source.hpp include/mbgl/storage/resource.hpp + include/mbgl/storage/resource_transform.hpp include/mbgl/storage/response.hpp src/mbgl/storage/asset_file_source.hpp + src/mbgl/storage/file_source_request.cpp + src/mbgl/storage/file_source_request.hpp src/mbgl/storage/http_file_source.hpp src/mbgl/storage/local_file_source.hpp src/mbgl/storage/network_status.cpp src/mbgl/storage/resource.cpp + src/mbgl/storage/resource_transform.cpp src/mbgl/storage/response.cpp # style @@ -317,12 +334,14 @@ set(MBGL_CORE_FILES include/mbgl/style/position.hpp include/mbgl/style/property_value.hpp include/mbgl/style/source.hpp + include/mbgl/style/style.hpp include/mbgl/style/transition_options.hpp include/mbgl/style/types.hpp include/mbgl/style/undefined.hpp - src/mbgl/style/class_dictionary.cpp - src/mbgl/style/class_dictionary.hpp + src/mbgl/style/collection.hpp src/mbgl/style/image.cpp + src/mbgl/style/image_impl.cpp + src/mbgl/style/image_impl.hpp src/mbgl/style/layer.cpp src/mbgl/style/layer_impl.cpp src/mbgl/style/layer_impl.hpp @@ -332,25 +351,24 @@ set(MBGL_CORE_FILES src/mbgl/style/light_impl.cpp src/mbgl/style/light_impl.hpp src/mbgl/style/light_observer.hpp - src/mbgl/style/light_properties.hpp src/mbgl/style/observer.hpp src/mbgl/style/paint_property.hpp src/mbgl/style/parser.cpp src/mbgl/style/parser.hpp + src/mbgl/style/properties.hpp src/mbgl/style/rapidjson_conversion.hpp src/mbgl/style/source.cpp src/mbgl/style/source_impl.cpp src/mbgl/style/source_impl.hpp src/mbgl/style/source_observer.hpp src/mbgl/style/style.cpp - src/mbgl/style/style.hpp - src/mbgl/style/tile_source_impl.cpp - src/mbgl/style/tile_source_impl.hpp + src/mbgl/style/style_impl.cpp + src/mbgl/style/style_impl.hpp src/mbgl/style/types.cpp - src/mbgl/style/update_batch.hpp # style/conversion include/mbgl/style/conversion/constant.hpp + include/mbgl/style/conversion/coordinate.hpp include/mbgl/style/conversion/data_driven_property_value.hpp include/mbgl/style/conversion/filter.hpp include/mbgl/style/conversion/function.hpp @@ -366,6 +384,7 @@ set(MBGL_CORE_FILES include/mbgl/style/conversion/tileset.hpp include/mbgl/style/conversion/transition_options.hpp src/mbgl/style/conversion/geojson.cpp + src/mbgl/style/conversion/json.hpp src/mbgl/style/conversion/stringify.hpp # style/function @@ -432,11 +451,15 @@ set(MBGL_CORE_FILES # style/sources include/mbgl/style/sources/geojson_source.hpp + include/mbgl/style/sources/image_source.hpp include/mbgl/style/sources/raster_source.hpp include/mbgl/style/sources/vector_source.hpp src/mbgl/style/sources/geojson_source.cpp src/mbgl/style/sources/geojson_source_impl.cpp src/mbgl/style/sources/geojson_source_impl.hpp + src/mbgl/style/sources/image_source.cpp + src/mbgl/style/sources/image_source_impl.cpp + src/mbgl/style/sources/image_source_impl.hpp src/mbgl/style/sources/raster_source.cpp src/mbgl/style/sources/raster_source_impl.cpp src/mbgl/style/sources/raster_source_impl.hpp @@ -458,7 +481,9 @@ set(MBGL_CORE_FILES src/mbgl/text/glyph.hpp src/mbgl/text/glyph_atlas.cpp src/mbgl/text/glyph_atlas.hpp - src/mbgl/text/glyph_atlas_observer.hpp + src/mbgl/text/glyph_manager.cpp + src/mbgl/text/glyph_manager.hpp + src/mbgl/text/glyph_manager_observer.hpp src/mbgl/text/glyph_pbf.cpp src/mbgl/text/glyph_pbf.hpp src/mbgl/text/glyph_range.hpp @@ -492,6 +517,8 @@ set(MBGL_CORE_FILES src/mbgl/tile/tile_observer.hpp src/mbgl/tile/vector_tile.cpp src/mbgl/tile/vector_tile.hpp + src/mbgl/tile/vector_tile_data.cpp + src/mbgl/tile/vector_tile_data.hpp # util include/mbgl/util/any.hpp @@ -513,6 +540,7 @@ set(MBGL_CORE_FILES include/mbgl/util/geometry.hpp include/mbgl/util/ignore.hpp include/mbgl/util/image.hpp + include/mbgl/util/immutable.hpp include/mbgl/util/indexed_tuple.hpp include/mbgl/util/interpolate.hpp include/mbgl/util/logging.hpp @@ -562,6 +590,7 @@ set(MBGL_CORE_FILES src/mbgl/util/io.cpp src/mbgl/util/io.hpp src/mbgl/util/logging.cpp + src/mbgl/util/longest_common_subsequence.hpp src/mbgl/util/mapbox.cpp src/mbgl/util/mapbox.hpp src/mbgl/util/mat2.cpp @@ -580,10 +609,8 @@ set(MBGL_CORE_FILES src/mbgl/util/stopwatch.cpp src/mbgl/util/stopwatch.hpp src/mbgl/util/string.cpp - src/mbgl/util/thread.hpp - src/mbgl/util/thread_context.cpp - src/mbgl/util/thread_context.hpp src/mbgl/util/thread_local.hpp + src/mbgl/util/thread.hpp src/mbgl/util/throttler.cpp src/mbgl/util/throttler.hpp src/mbgl/util/tile_coordinate.hpp @@ -595,7 +622,5 @@ set(MBGL_CORE_FILES src/mbgl/util/utf.hpp src/mbgl/util/version.cpp src/mbgl/util/version.hpp - src/mbgl/util/work_queue.cpp - src/mbgl/util/work_queue.hpp src/mbgl/util/work_request.cpp ) diff --git a/cmake/core.cmake b/cmake/core.cmake index 531edc092d..c4e4d2abc7 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -26,6 +26,8 @@ target_add_mason_package(mbgl-core PRIVATE earcut) target_add_mason_package(mbgl-core PRIVATE protozero) target_add_mason_package(mbgl-core PRIVATE polylabel) target_add_mason_package(mbgl-core PRIVATE wagyu) +target_add_mason_package(mbgl-core PRIVATE shelf-pack) +target_add_mason_package(mbgl-core PRIVATE vector-tile) mbgl_platform_core() diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index f1ace9e6ef..744477e39a 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -34,7 +34,11 @@ target_link_libraries(mbgl-glfw PRIVATE mbgl-core ) +target_add_mason_package(mbgl-glfw PRIVATE cheap-ruler) +target_add_mason_package(mbgl-glfw PRIVATE geojson) +target_add_mason_package(mbgl-glfw PRIVATE geometry) target_add_mason_package(mbgl-glfw PRIVATE glfw) +target_add_mason_package(mbgl-glfw PRIVATE variant) mbgl_platform_glfw() diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake index 0f55fce64c..182b0d6f90 100644 --- a/cmake/loop-uv.cmake +++ b/cmake/loop-uv.cmake @@ -14,4 +14,8 @@ target_include_directories(mbgl-loop-uv PRIVATE src ) +target_link_libraries(mbgl-loop-uv + PRIVATE mbgl-core +) + create_source_groups(mbgl-loop-uv) diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 14e5b0d691..9ef2ddd306 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -44,6 +44,12 @@ execute_process( COMMAND git submodule update --init mapbox-gl-js WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +if(MBGL_PLATFORM STREQUAL "ios") + execute_process( + COMMAND git submodule update --init platform/ios/vendor/SMCalloutView platform/ios/uitest/KIF platform/ios/uitest/OHHTTPStubs + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +endif() + if(NOT EXISTS "${CMAKE_SOURCE_DIR}/mapbox-gl-js/node_modules") # Symlink mapbox-gl-js/node_modules so that the modules that are # about to be installed get cached between CI runs. diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 6026374de6..edbf100fe2 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -19,9 +19,6 @@ set(MBGL_TEST_FILES test/api/render_missing.test.cpp test/api/repeated_render.test.cpp - # geometry - test/geometry/binpack.test.cpp - # gl test/gl/bucket.test.cpp test/gl/object.test.cpp @@ -40,12 +37,14 @@ set(MBGL_TEST_FILES # programs test/programs/binary_program.test.cpp + test/programs/symbol_program.test.cpp # renderer test/renderer/group_by_layout.test.cpp + test/renderer/image_manager.test.cpp # sprite - test/sprite/sprite_atlas.test.cpp + test/sprite/sprite_loader.test.cpp test/sprite/sprite_parser.test.cpp # src/mbgl/test @@ -92,10 +91,12 @@ set(MBGL_TEST_FILES # style/function test/style/function/camera_function.test.cpp test/style/function/composite_function.test.cpp + test/style/function/exponential_stops.test.cpp + test/style/function/interval_stops.test.cpp test/style/function/source_function.test.cpp # style - test/style/paint_property.test.cpp + test/style/properties.test.cpp test/style/source.test.cpp test/style/style.test.cpp test/style/style_image.test.cpp @@ -103,7 +104,7 @@ set(MBGL_TEST_FILES test/style/style_parser.test.cpp # text - test/text/glyph_atlas.test.cpp + test/text/glyph_loader.test.cpp test/text/glyph_pbf.test.cpp test/text/quads.test.cpp @@ -136,5 +137,4 @@ set(MBGL_TEST_FILES test/util/timer.test.cpp test/util/token.test.cpp test/util/url.test.cpp - test/util/work_queue.test.cpp ) diff --git a/cmake/test.cmake b/cmake/test.cmake index 3c63f7bcf8..8a5233f5a5 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -35,6 +35,7 @@ target_add_mason_package(mbgl-test PRIVATE pixelmatch) target_add_mason_package(mbgl-test PRIVATE boost) target_add_mason_package(mbgl-test PRIVATE geojson) target_add_mason_package(mbgl-test PRIVATE geojsonvt) +target_add_mason_package(mbgl-test PRIVATE shelf-pack) mbgl_platform_test() |