diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/benchmark-files.cmake | 19 | ||||
| -rw-r--r-- | cmake/benchmark.cmake | 5 | ||||
| -rw-r--r-- | cmake/core-files.cmake | 157 | ||||
| -rw-r--r-- | cmake/core.cmake | 6 | ||||
| -rw-r--r-- | cmake/files.cmake.ejs | 13 | ||||
| -rw-r--r-- | cmake/filesource.cmake | 8 | ||||
| -rw-r--r-- | cmake/glfw.cmake | 5 | ||||
| -rw-r--r-- | cmake/loop-darwin.cmake | 7 | ||||
| -rw-r--r-- | cmake/loop-uv.cmake | 5 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 127 | ||||
| -rw-r--r-- | cmake/node.cmake | 19 | ||||
| -rw-r--r-- | cmake/offline.cmake | 6 | ||||
| -rw-r--r-- | cmake/render.cmake | 7 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 76 | ||||
| -rw-r--r-- | cmake/test.cmake | 5 |
15 files changed, 296 insertions, 169 deletions
diff --git a/cmake/benchmark-files.cmake b/cmake/benchmark-files.cmake index 9161209128..fdafcf30f9 100644 --- a/cmake/benchmark-files.cmake +++ b/cmake/benchmark-files.cmake @@ -1,30 +1,27 @@ -# Do not edit. Regenerate this with ./scripts/generate-benchmark-files.sh +# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js set(MBGL_BENCHMARK_FILES # api benchmark/api/query.benchmark.cpp benchmark/api/render.benchmark.cpp + # benchmark + benchmark/include/mbgl/benchmark.hpp + benchmark/src/main.cpp + benchmark/src/mbgl/benchmark/benchmark.cpp + benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp + # function benchmark/function/camera_function.benchmark.cpp benchmark/function/composite_function.benchmark.cpp benchmark/function/source_function.benchmark.cpp - # include/mbgl - benchmark/include/mbgl/benchmark.hpp - # parse benchmark/parse/filter.benchmark.cpp benchmark/parse/tile_mask.benchmark.cpp benchmark/parse/vector_tile.benchmark.cpp - # src - benchmark/src/main.cpp - - # src/mbgl/benchmark - benchmark/src/mbgl/benchmark/benchmark.cpp - benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp - # util benchmark/util/dtoa.benchmark.cpp + ) diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 87351e97b1..ea5b3dfa7a 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -2,10 +2,6 @@ add_executable(mbgl-benchmark ${MBGL_BENCHMARK_FILES} ) -target_compile_options(mbgl-benchmark - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-benchmark PRIVATE src PRIVATE benchmark/include @@ -19,6 +15,7 @@ target_link_libraries(mbgl-benchmark target_add_mason_package(mbgl-benchmark PRIVATE boost) target_add_mason_package(mbgl-benchmark PRIVATE benchmark) +target_add_mason_package(mbgl-benchmark PRIVATE geojson) 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) diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 0c109d080d..f24482e301 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -1,4 +1,4 @@ -# Do not edit. Regenerate this with ./scripts/generate-core-files.sh +# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js set(MBGL_CORE_FILES # actor @@ -44,6 +44,8 @@ set(MBGL_CORE_FILES # geometry src/mbgl/geometry/anchor.hpp src/mbgl/geometry/debug_font_data.hpp + src/mbgl/geometry/dem_data.cpp + src/mbgl/geometry/dem_data.hpp src/mbgl/geometry/feature_index.cpp src/mbgl/geometry/feature_index.hpp src/mbgl/geometry/line_atlas.cpp @@ -128,10 +130,13 @@ set(MBGL_CORE_FILES # programs src/mbgl/programs/attributes.hpp + src/mbgl/programs/background_program.cpp + src/mbgl/programs/background_program.hpp src/mbgl/programs/binary_program.cpp src/mbgl/programs/binary_program.hpp src/mbgl/programs/circle_program.cpp src/mbgl/programs/circle_program.hpp + src/mbgl/programs/clipping_mask_program.hpp src/mbgl/programs/collision_box_program.cpp src/mbgl/programs/collision_box_program.hpp src/mbgl/programs/debug_program.hpp @@ -141,6 +146,14 @@ set(MBGL_CORE_FILES src/mbgl/programs/fill_extrusion_program.hpp src/mbgl/programs/fill_program.cpp src/mbgl/programs/fill_program.hpp + src/mbgl/programs/heatmap_program.cpp + src/mbgl/programs/heatmap_program.hpp + src/mbgl/programs/heatmap_texture_program.cpp + src/mbgl/programs/heatmap_texture_program.hpp + src/mbgl/programs/hillshade_prepare_program.cpp + src/mbgl/programs/hillshade_prepare_program.hpp + src/mbgl/programs/hillshade_program.cpp + src/mbgl/programs/hillshade_program.hpp src/mbgl/programs/line_program.cpp src/mbgl/programs/line_program.hpp src/mbgl/programs/program.hpp @@ -156,10 +169,12 @@ set(MBGL_CORE_FILES # renderer include/mbgl/renderer/backend_scope.hpp + include/mbgl/renderer/mode.hpp include/mbgl/renderer/query.hpp include/mbgl/renderer/renderer.hpp include/mbgl/renderer/renderer_backend.hpp include/mbgl/renderer/renderer_frontend.hpp + include/mbgl/renderer/renderer_observer.hpp src/mbgl/renderer/backend_scope.cpp src/mbgl/renderer/bucket.hpp src/mbgl/renderer/bucket_parameters.cpp @@ -167,8 +182,6 @@ set(MBGL_CORE_FILES 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/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/image_atlas.cpp @@ -198,7 +211,6 @@ set(MBGL_CORE_FILES src/mbgl/renderer/renderer_backend.cpp src/mbgl/renderer/renderer_impl.cpp src/mbgl/renderer/renderer_impl.hpp - src/mbgl/renderer/renderer_observer.hpp src/mbgl/renderer/style_diff.cpp src/mbgl/renderer/style_diff.hpp src/mbgl/renderer/tile_mask.hpp @@ -217,6 +229,10 @@ set(MBGL_CORE_FILES 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/heatmap_bucket.cpp + src/mbgl/renderer/buckets/heatmap_bucket.hpp + src/mbgl/renderer/buckets/hillshade_bucket.cpp + src/mbgl/renderer/buckets/hillshade_bucket.hpp src/mbgl/renderer/buckets/line_bucket.cpp src/mbgl/renderer/buckets/line_bucket.hpp src/mbgl/renderer/buckets/raster_bucket.cpp @@ -235,6 +251,10 @@ set(MBGL_CORE_FILES 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_heatmap_layer.cpp + src/mbgl/renderer/layers/render_heatmap_layer.hpp + src/mbgl/renderer/layers/render_hillshade_layer.cpp + src/mbgl/renderer/layers/render_hillshade_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 @@ -243,20 +263,32 @@ set(MBGL_CORE_FILES src/mbgl/renderer/layers/render_symbol_layer.hpp # renderer/sources + src/mbgl/renderer/sources/render_custom_geometry_source.cpp + src/mbgl/renderer/sources/render_custom_geometry_source.hpp 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_dem_source.cpp + src/mbgl/renderer/sources/render_raster_dem_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 src/mbgl/renderer/sources/render_vector_source.hpp # shaders + src/mbgl/shaders/background.cpp + src/mbgl/shaders/background.hpp + src/mbgl/shaders/background_pattern.cpp + src/mbgl/shaders/background_pattern.hpp src/mbgl/shaders/circle.cpp src/mbgl/shaders/circle.hpp + src/mbgl/shaders/clipping_mask.cpp + src/mbgl/shaders/clipping_mask.hpp src/mbgl/shaders/collision_box.cpp src/mbgl/shaders/collision_box.hpp + src/mbgl/shaders/collision_circle.cpp + src/mbgl/shaders/collision_circle.hpp src/mbgl/shaders/debug.cpp src/mbgl/shaders/debug.hpp src/mbgl/shaders/extrusion_texture.cpp @@ -273,6 +305,14 @@ set(MBGL_CORE_FILES src/mbgl/shaders/fill_outline_pattern.hpp src/mbgl/shaders/fill_pattern.cpp src/mbgl/shaders/fill_pattern.hpp + src/mbgl/shaders/heatmap.cpp + src/mbgl/shaders/heatmap.hpp + src/mbgl/shaders/heatmap_texture.cpp + src/mbgl/shaders/heatmap_texture.hpp + src/mbgl/shaders/hillshade.cpp + src/mbgl/shaders/hillshade.hpp + src/mbgl/shaders/hillshade_prepare.cpp + src/mbgl/shaders/hillshade_prepare.hpp src/mbgl/shaders/line.cpp src/mbgl/shaders/line.hpp src/mbgl/shaders/line_pattern.cpp @@ -321,6 +361,7 @@ set(MBGL_CORE_FILES include/mbgl/style/data_driven_property_value.hpp include/mbgl/style/filter.hpp include/mbgl/style/filter_evaluator.hpp + include/mbgl/style/heatmap_color_property_value.hpp include/mbgl/style/image.hpp include/mbgl/style/layer.hpp include/mbgl/style/layer_type.hpp @@ -333,6 +374,8 @@ set(MBGL_CORE_FILES include/mbgl/style/types.hpp include/mbgl/style/undefined.hpp src/mbgl/style/collection.hpp + src/mbgl/style/custom_tile_loader.cpp + src/mbgl/style/custom_tile_loader.hpp src/mbgl/style/image.cpp src/mbgl/style/image_impl.cpp src/mbgl/style/image_impl.hpp @@ -363,23 +406,86 @@ set(MBGL_CORE_FILES # style/conversion include/mbgl/style/conversion/constant.hpp include/mbgl/style/conversion/coordinate.hpp + include/mbgl/style/conversion/custom_geometry_source_options.hpp include/mbgl/style/conversion/data_driven_property_value.hpp + include/mbgl/style/conversion/expression.hpp include/mbgl/style/conversion/filter.hpp include/mbgl/style/conversion/function.hpp include/mbgl/style/conversion/geojson.hpp include/mbgl/style/conversion/geojson_options.hpp + include/mbgl/style/conversion/get_json_type.hpp + include/mbgl/style/conversion/heatmap_color_property_value.hpp include/mbgl/style/conversion/layer.hpp include/mbgl/style/conversion/light.hpp - include/mbgl/style/conversion/make_property_setters.hpp include/mbgl/style/conversion/position.hpp - include/mbgl/style/conversion/property_setter.hpp include/mbgl/style/conversion/property_value.hpp include/mbgl/style/conversion/source.hpp include/mbgl/style/conversion/tileset.hpp include/mbgl/style/conversion/transition_options.hpp + src/mbgl/style/conversion/constant.cpp + src/mbgl/style/conversion/coordinate.cpp + src/mbgl/style/conversion/filter.cpp src/mbgl/style/conversion/geojson.cpp + src/mbgl/style/conversion/geojson_options.cpp + src/mbgl/style/conversion/get_json_type.cpp src/mbgl/style/conversion/json.hpp + src/mbgl/style/conversion/layer.cpp + src/mbgl/style/conversion/light.cpp + src/mbgl/style/conversion/make_property_setters.hpp + src/mbgl/style/conversion/position.cpp + src/mbgl/style/conversion/property_setter.hpp + src/mbgl/style/conversion/source.cpp src/mbgl/style/conversion/stringify.hpp + src/mbgl/style/conversion/tileset.cpp + src/mbgl/style/conversion/transition_options.cpp + + # style/expression + include/mbgl/style/expression/array_assertion.hpp + include/mbgl/style/expression/assertion.hpp + include/mbgl/style/expression/at.hpp + include/mbgl/style/expression/boolean_operator.hpp + include/mbgl/style/expression/case.hpp + include/mbgl/style/expression/check_subtype.hpp + include/mbgl/style/expression/coalesce.hpp + include/mbgl/style/expression/coercion.hpp + include/mbgl/style/expression/compound_expression.hpp + include/mbgl/style/expression/equals.hpp + include/mbgl/style/expression/expression.hpp + include/mbgl/style/expression/find_zoom_curve.hpp + include/mbgl/style/expression/get_covering_stops.hpp + include/mbgl/style/expression/interpolate.hpp + include/mbgl/style/expression/is_constant.hpp + include/mbgl/style/expression/is_expression.hpp + include/mbgl/style/expression/let.hpp + include/mbgl/style/expression/literal.hpp + include/mbgl/style/expression/match.hpp + include/mbgl/style/expression/parsing_context.hpp + include/mbgl/style/expression/step.hpp + include/mbgl/style/expression/type.hpp + include/mbgl/style/expression/value.hpp + src/mbgl/style/expression/array_assertion.cpp + src/mbgl/style/expression/assertion.cpp + src/mbgl/style/expression/at.cpp + src/mbgl/style/expression/boolean_operator.cpp + src/mbgl/style/expression/case.cpp + src/mbgl/style/expression/check_subtype.cpp + src/mbgl/style/expression/coalesce.cpp + src/mbgl/style/expression/coercion.cpp + src/mbgl/style/expression/compound_expression.cpp + src/mbgl/style/expression/equals.cpp + src/mbgl/style/expression/find_zoom_curve.cpp + src/mbgl/style/expression/get_covering_stops.cpp + src/mbgl/style/expression/interpolate.cpp + src/mbgl/style/expression/is_constant.cpp + src/mbgl/style/expression/is_expression.cpp + src/mbgl/style/expression/let.cpp + src/mbgl/style/expression/literal.cpp + src/mbgl/style/expression/match.cpp + src/mbgl/style/expression/parsing_context.cpp + src/mbgl/style/expression/step.cpp + src/mbgl/style/expression/util.cpp + src/mbgl/style/expression/util.hpp + src/mbgl/style/expression/value.cpp # style/function include/mbgl/style/function/camera_function.hpp @@ -388,11 +494,13 @@ set(MBGL_CORE_FILES include/mbgl/style/function/composite_exponential_stops.hpp include/mbgl/style/function/composite_function.hpp include/mbgl/style/function/composite_interval_stops.hpp + include/mbgl/style/function/convert.hpp include/mbgl/style/function/exponential_stops.hpp include/mbgl/style/function/identity_stops.hpp include/mbgl/style/function/interval_stops.hpp include/mbgl/style/function/source_function.hpp src/mbgl/style/function/categorical_stops.cpp + src/mbgl/style/function/expression.cpp src/mbgl/style/function/identity_stops.cpp # style/layers @@ -401,6 +509,8 @@ set(MBGL_CORE_FILES include/mbgl/style/layers/custom_layer.hpp include/mbgl/style/layers/fill_extrusion_layer.hpp include/mbgl/style/layers/fill_layer.hpp + include/mbgl/style/layers/heatmap_layer.hpp + include/mbgl/style/layers/hillshade_layer.hpp include/mbgl/style/layers/line_layer.hpp include/mbgl/style/layers/raster_layer.hpp include/mbgl/style/layers/symbol_layer.hpp @@ -427,6 +537,16 @@ set(MBGL_CORE_FILES src/mbgl/style/layers/fill_layer_impl.hpp src/mbgl/style/layers/fill_layer_properties.cpp src/mbgl/style/layers/fill_layer_properties.hpp + src/mbgl/style/layers/heatmap_layer.cpp + src/mbgl/style/layers/heatmap_layer_impl.cpp + src/mbgl/style/layers/heatmap_layer_impl.hpp + src/mbgl/style/layers/heatmap_layer_properties.cpp + src/mbgl/style/layers/heatmap_layer_properties.hpp + src/mbgl/style/layers/hillshade_layer.cpp + src/mbgl/style/layers/hillshade_layer_impl.cpp + src/mbgl/style/layers/hillshade_layer_impl.hpp + src/mbgl/style/layers/hillshade_layer_properties.cpp + src/mbgl/style/layers/hillshade_layer_properties.hpp src/mbgl/style/layers/line_layer.cpp src/mbgl/style/layers/line_layer_impl.cpp src/mbgl/style/layers/line_layer_impl.hpp @@ -444,16 +564,22 @@ set(MBGL_CORE_FILES src/mbgl/style/layers/symbol_layer_properties.hpp # style/sources + include/mbgl/style/sources/custom_geometry_source.hpp include/mbgl/style/sources/geojson_source.hpp include/mbgl/style/sources/image_source.hpp + include/mbgl/style/sources/raster_dem_source.hpp include/mbgl/style/sources/raster_source.hpp include/mbgl/style/sources/vector_source.hpp + src/mbgl/style/sources/custom_geometry_source.cpp + src/mbgl/style/sources/custom_geometry_source_impl.cpp + src/mbgl/style/sources/custom_geometry_source_impl.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_dem_source.cpp src/mbgl/style/sources/raster_source.cpp src/mbgl/style/sources/raster_source_impl.cpp src/mbgl/style/sources/raster_source_impl.hpp @@ -467,8 +593,10 @@ set(MBGL_CORE_FILES src/mbgl/text/check_max_angle.hpp src/mbgl/text/collision_feature.cpp src/mbgl/text/collision_feature.hpp - src/mbgl/text/collision_tile.cpp - src/mbgl/text/collision_tile.hpp + src/mbgl/text/collision_index.cpp + src/mbgl/text/collision_index.hpp + src/mbgl/text/cross_tile_symbol_index.cpp + src/mbgl/text/cross_tile_symbol_index.hpp src/mbgl/text/get_anchors.cpp src/mbgl/text/get_anchors.hpp src/mbgl/text/glyph.cpp @@ -482,7 +610,8 @@ set(MBGL_CORE_FILES src/mbgl/text/glyph_pbf.hpp src/mbgl/text/glyph_range.hpp src/mbgl/text/local_glyph_rasterizer.hpp - src/mbgl/text/placement_config.hpp + src/mbgl/text/placement.cpp + src/mbgl/text/placement.hpp src/mbgl/text/quads.cpp src/mbgl/text/quads.hpp src/mbgl/text/shaping.cpp @@ -491,6 +620,8 @@ set(MBGL_CORE_FILES # tile include/mbgl/tile/tile_id.hpp include/mbgl/tile/tile_necessity.hpp + src/mbgl/tile/custom_geometry_tile.cpp + src/mbgl/tile/custom_geometry_tile.hpp src/mbgl/tile/geojson_tile.cpp src/mbgl/tile/geojson_tile.hpp src/mbgl/tile/geojson_tile_data.hpp @@ -500,6 +631,10 @@ set(MBGL_CORE_FILES src/mbgl/tile/geometry_tile_data.hpp src/mbgl/tile/geometry_tile_worker.cpp src/mbgl/tile/geometry_tile_worker.hpp + src/mbgl/tile/raster_dem_tile.cpp + src/mbgl/tile/raster_dem_tile.hpp + src/mbgl/tile/raster_dem_tile_worker.cpp + src/mbgl/tile/raster_dem_tile_worker.hpp src/mbgl/tile/raster_tile.cpp src/mbgl/tile/raster_tile.hpp src/mbgl/tile/raster_tile_worker.cpp @@ -519,7 +654,6 @@ set(MBGL_CORE_FILES src/mbgl/tile/vector_tile_data.hpp # util - include/mbgl/util/any.hpp include/mbgl/util/async_request.hpp include/mbgl/util/async_task.hpp include/mbgl/util/char_array_buffer.hpp @@ -555,7 +689,9 @@ set(MBGL_CORE_FILES include/mbgl/util/tileset.hpp include/mbgl/util/timer.hpp include/mbgl/util/traits.hpp + include/mbgl/util/tuple.hpp include/mbgl/util/type_list.hpp + include/mbgl/util/unique_any.hpp include/mbgl/util/unitbezier.hpp include/mbgl/util/util.hpp include/mbgl/util/variant.hpp @@ -624,4 +760,5 @@ set(MBGL_CORE_FILES src/mbgl/util/version.cpp src/mbgl/util/version.hpp src/mbgl/util/work_request.cpp + ) diff --git a/cmake/core.cmake b/cmake/core.cmake index c4e711f558..43ec141b78 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -2,11 +2,6 @@ add_library(mbgl-core STATIC ${MBGL_CORE_FILES} ) -target_compile_options(mbgl-core - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-core PUBLIC include PRIVATE src @@ -14,7 +9,6 @@ target_include_directories(mbgl-core target_add_mason_package(mbgl-core PUBLIC geometry) target_add_mason_package(mbgl-core PUBLIC variant) -target_add_mason_package(mbgl-core PUBLIC any) target_add_mason_package(mbgl-core PRIVATE unique_resource) target_add_mason_package(mbgl-core PRIVATE rapidjson) target_add_mason_package(mbgl-core PRIVATE boost) diff --git a/cmake/files.cmake.ejs b/cmake/files.cmake.ejs new file mode 100644 index 0000000000..57126509ed --- /dev/null +++ b/cmake/files.cmake.ejs @@ -0,0 +1,13 @@ +<% + const name = locals.name; + const groups = locals.groups; +-%> +# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js + +set(MBGL_<%- snakeCaseUpper(name) %>_FILES +<% for (const key of Object.keys(groups).sort()) { -%> + # <%- key %> + <%- groups[key].sort().join('\n ') %> + +<% } -%> +) diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake index bb1b4e8c05..861a845d6e 100644 --- a/cmake/filesource.cmake +++ b/cmake/filesource.cmake @@ -26,18 +26,10 @@ add_library(mbgl-filesource STATIC target_add_mason_package(mbgl-filesource PUBLIC geometry) target_add_mason_package(mbgl-filesource PUBLIC variant) -target_add_mason_package(mbgl-filesource PUBLIC any) target_add_mason_package(mbgl-filesource PRIVATE rapidjson) target_add_mason_package(mbgl-filesource PRIVATE boost) target_add_mason_package(mbgl-filesource PRIVATE geojson) -set_xcode_property(mbgl-filesource GCC_SYMBOLS_PRIVATE_EXTERN YES) - -target_compile_options(mbgl-filesource - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-filesource PRIVATE include PRIVATE src diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index 29d8d2ba94..2b2cb47ecb 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -12,10 +12,6 @@ target_sources(mbgl-glfw PRIVATE platform/default/mbgl/util/default_styles.hpp ) -target_compile_options(mbgl-glfw - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-glfw PRIVATE platform/default ) @@ -29,6 +25,7 @@ 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) +target_add_mason_package(mbgl-glfw PRIVATE args) mbgl_platform_glfw() diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake index 46511d2548..692aecb8a2 100644 --- a/cmake/loop-darwin.cmake +++ b/cmake/loop-darwin.cmake @@ -4,13 +4,6 @@ add_library(mbgl-loop-darwin STATIC platform/darwin/src/timer.cpp ) -set_xcode_property(mbgl-loop-darwin GCC_SYMBOLS_PRIVATE_EXTERN YES) - -target_compile_options(mbgl-loop-darwin - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-loop-darwin PRIVATE include PRIVATE src diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake index 8840040963..f4e7ced00e 100644 --- a/cmake/loop-uv.cmake +++ b/cmake/loop-uv.cmake @@ -4,11 +4,6 @@ add_library(mbgl-loop-uv STATIC platform/default/timer.cpp ) -target_compile_options(mbgl-loop-uv - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-loop-uv PRIVATE include PRIVATE src diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index d853950c0d..3d82899538 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -6,73 +6,69 @@ if (NOT MBGL_PLATFORM) endif() endif() -find_program(NodeJS_EXECUTABLE NAMES nodejs node) -if (NOT NodeJS_EXECUTABLE) - message(FATAL_ERROR "Could not find Node.js") -endif() - -find_program(npm_EXECUTABLE NAMES npm) -if (NOT npm_EXECUTABLE) - message(FATAL_ERROR "Could not find npm") -endif() +if(WITH_NODEJS) + find_program(NodeJS_EXECUTABLE NAMES nodejs node) + if (NOT NodeJS_EXECUTABLE) + message(FATAL_ERROR "Could not find Node.js") + endif() -function(_npm_install DIRECTORY NAME ADDITIONAL_DEPS) - SET(NPM_INSTALL_FAILED FALSE) - if("${DIRECTORY}/package.json" IS_NEWER_THAN "${DIRECTORY}/node_modules/.${NAME}.stamp") - message(STATUS "Running 'npm install' for ${NAME}...") - execute_process( - COMMAND ${NodeJS_EXECUTABLE} ${npm_EXECUTABLE} install --ignore-scripts - WORKING_DIRECTORY "${DIRECTORY}" - RESULT_VARIABLE NPM_INSTALL_FAILED) - if(NOT NPM_INSTALL_FAILED) - execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${DIRECTORY}/node_modules/.${NAME}.stamp") - endif() + find_program(npm_EXECUTABLE NAMES npm) + if (NOT npm_EXECUTABLE) + message(FATAL_ERROR "Could not find npm") endif() - add_custom_command( - OUTPUT "${DIRECTORY}/node_modules/.${NAME}.stamp" - COMMAND ${NodeJS_EXECUTABLE} ${npm_EXECUTABLE} install --ignore-scripts - COMMAND ${CMAKE_COMMAND} -E touch "${DIRECTORY}/node_modules/.${NAME}.stamp" - WORKING_DIRECTORY "${DIRECTORY}" - DEPENDS ${ADDITIONAL_DEPS} "${DIRECTORY}/package.json" - COMMENT "Running 'npm install' for ${NAME}...") -endfunction() + function(_npm_install DIRECTORY NAME ADDITIONAL_DEPS) + SET(NPM_INSTALL_FAILED FALSE) + if("${DIRECTORY}/package.json" IS_NEWER_THAN "${DIRECTORY}/node_modules/.${NAME}.stamp") + message(STATUS "Running 'npm install' for ${NAME}...") + execute_process( + COMMAND ${NodeJS_EXECUTABLE} ${npm_EXECUTABLE} install --ignore-scripts + WORKING_DIRECTORY "${DIRECTORY}" + RESULT_VARIABLE NPM_INSTALL_FAILED) + if(NOT NPM_INSTALL_FAILED) + execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${DIRECTORY}/node_modules/.${NAME}.stamp") + endif() + endif() -# Run submodule update -message(STATUS "Updating submodules...") -execute_process( - COMMAND git submodule update --init mapbox-gl-js - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") + add_custom_command( + OUTPUT "${DIRECTORY}/node_modules/.${NAME}.stamp" + COMMAND ${NodeJS_EXECUTABLE} ${npm_EXECUTABLE} install --ignore-scripts + COMMAND ${CMAKE_COMMAND} -E touch "${DIRECTORY}/node_modules/.${NAME}.stamp" + WORKING_DIRECTORY "${DIRECTORY}" + DEPENDS ${ADDITIONAL_DEPS} "${DIRECTORY}/package.json" + COMMENT "Running 'npm install' for ${NAME}...") + endfunction() -if(MBGL_PLATFORM STREQUAL "ios") + # Run submodule update + message(STATUS "Updating submodules...") execute_process( - COMMAND git submodule update --init platform/ios/vendor/SMCalloutView platform/ios/uitest/KIF platform/ios/uitest/OHHTTPStubs + COMMAND git submodule update --init mapbox-gl-js 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. - execute_process( - COMMAND ln -sF ../node_modules . - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/mapbox-gl-js") -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. + execute_process( + COMMAND ln -sF ../node_modules . + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/mapbox-gl-js") + endif() + + # Add target for running submodule update during builds + add_custom_target( + update-submodules ALL + COMMAND git submodule update --init mapbox-gl-js + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + COMMENT "Updating submodules..." + ) -# Add target for running submodule update during builds -add_custom_target( - update-submodules ALL - COMMAND git submodule update --init mapbox-gl-js - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - COMMENT "Updating submodules..." -) - -# Run npm install for both directories, and add custom commands, and a target that depends on them. -_npm_install("${CMAKE_SOURCE_DIR}" mapbox-gl-native update-submodules) -_npm_install("${CMAKE_SOURCE_DIR}/mapbox-gl-js/test/integration" mapbox-gl-js "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-native.stamp") -add_custom_target( - npm-install ALL - DEPENDS "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-js.stamp" -) + # Run npm install for both directories, and add custom commands, and a target that depends on them. + _npm_install("${CMAKE_SOURCE_DIR}" mapbox-gl-native update-submodules) + _npm_install("${CMAKE_SOURCE_DIR}/mapbox-gl-js/test/integration" mapbox-gl-js "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-native.stamp") + add_custom_target( + npm-install ALL + DEPENDS "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-js.stamp" + ) +endif() # Generate source groups so the files are properly sorted in IDEs like Xcode. function(create_source_groups target) @@ -112,6 +108,12 @@ function(_get_xcconfig_property target var) endif() endfunction() +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() + function(write_xcconfig_target_properties) foreach(target ${ARGN}) _get_xcconfig_property(${target} INCLUDE_DIRECTORIES) @@ -143,11 +145,14 @@ macro(initialize_xcode_cxx_build_settings target) # -Wshadow set_xcode_property(${target} GCC_WARN_SHADOW YES) - # -Wno-unknown-pragmas - set_xcode_property(${target} GCC_WARN_UNKNOWN_PRAGMAS YES) - # -Wnon-virtual-dtor set_xcode_property(${target} GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES) + + # -Wnon-literal-conversion + set_xcode_property(${target} CLANG_WARN_NON_LITERAL_NULL_CONVERSION YES) + + # -Wrange-loop-analysis + set_xcode_property(${target} CLANG_WARN_RANGE_LOOP_ANALYSIS YES) endmacro(initialize_xcode_cxx_build_settings) # CMake 3.1 does not have this yet. diff --git a/cmake/node.cmake b/cmake/node.cmake index c256b13f93..0c2f556b7d 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -13,6 +13,7 @@ set_target_properties("mbgl-node" PROPERTIES CXX_STANDARD 14) target_sources(mbgl-node PRIVATE platform/node/src/node_logging.hpp PRIVATE platform/node/src/node_logging.cpp + PRIVATE platform/node/src/node_conversion.hpp PRIVATE platform/node/src/node_map.hpp PRIVATE platform/node/src/node_map.cpp PRIVATE platform/node/src/node_request.hpp @@ -21,14 +22,11 @@ target_sources(mbgl-node PRIVATE platform/node/src/node_feature.cpp PRIVATE platform/node/src/node_thread_pool.hpp PRIVATE platform/node/src/node_thread_pool.cpp + PRIVATE platform/node/src/node_expression.hpp + PRIVATE platform/node/src/node_expression.cpp PRIVATE platform/node/src/util/async_queue.hpp ) -target_compile_options(mbgl-node - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-node PRIVATE platform/default ) @@ -93,6 +91,17 @@ xcode_create_scheme( xcode_create_scheme( TARGET mbgl-node TYPE node + NAME "node expression tests" + ARGS + "platform/node/test/expression.test.js" + OPTIONAL_ARGS + "group" + "test" +) + +xcode_create_scheme( + TARGET mbgl-node + TYPE node NAME "node-benchmark" ARGS "platform/node/test/benchmark.js" diff --git a/cmake/offline.cmake b/cmake/offline.cmake index c9a3349792..13b6c3fe70 100644 --- a/cmake/offline.cmake +++ b/cmake/offline.cmake @@ -6,10 +6,6 @@ target_sources(mbgl-offline PRIVATE platform/default/mbgl/util/default_styles.hpp ) -target_compile_options(mbgl-offline - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-offline PRIVATE platform/default ) @@ -19,7 +15,7 @@ target_link_libraries(mbgl-offline ) target_add_mason_package(mbgl-offline PRIVATE boost) -target_add_mason_package(mbgl-offline PRIVATE boost_libprogram_options) +target_add_mason_package(mbgl-offline PRIVATE args) mbgl_platform_offline() diff --git a/cmake/render.cmake b/cmake/render.cmake index f69aed16c0..c6e7d9dd59 100644 --- a/cmake/render.cmake +++ b/cmake/render.cmake @@ -2,10 +2,6 @@ add_executable(mbgl-render bin/render.cpp ) -target_compile_options(mbgl-render - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-render PRIVATE platform/default ) @@ -15,7 +11,8 @@ target_link_libraries(mbgl-render ) target_add_mason_package(mbgl-render PRIVATE boost) -target_add_mason_package(mbgl-render PRIVATE boost_libprogram_options) +target_add_mason_package(mbgl-render PRIVATE geojson) +target_add_mason_package(mbgl-render PRIVATE args) mbgl_platform_render() diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index dfd646e624..790198a55e 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -1,4 +1,4 @@ -# Do not edit. Regenerate this with ./scripts/generate-test-files.sh +# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js set(MBGL_TEST_FILES # actor @@ -15,18 +15,20 @@ set(MBGL_TEST_FILES # api test/api/annotations.test.cpp test/api/api_misuse.test.cpp + test/api/custom_geometry_source.test.cpp test/api/custom_layer.test.cpp test/api/query.test.cpp test/api/recycle_map.cpp test/api/zoom_history.cpp + # geometry + test/geometry/dem_data.test.cpp + # gl test/gl/bucket.test.cpp + test/gl/context.test.cpp test/gl/object.test.cpp - # include/mbgl - test/include/mbgl/test.hpp - # map test/map/map.test.cpp test/map/prefetch.test.cpp @@ -50,24 +52,6 @@ set(MBGL_TEST_FILES test/sprite/sprite_loader.test.cpp test/sprite/sprite_parser.test.cpp - # src/mbgl/test - test/src/mbgl/test/conversion_stubs.hpp - test/src/mbgl/test/fake_file_source.hpp - test/src/mbgl/test/fixture_log_observer.cpp - test/src/mbgl/test/fixture_log_observer.hpp - test/src/mbgl/test/getrss.cpp - test/src/mbgl/test/getrss.hpp - test/src/mbgl/test/stub_file_source.cpp - test/src/mbgl/test/stub_file_source.hpp - test/src/mbgl/test/stub_geometry_tile_feature.hpp - test/src/mbgl/test/stub_layer_observer.hpp - test/src/mbgl/test/stub_render_source_observer.hpp - test/src/mbgl/test/stub_style_observer.hpp - test/src/mbgl/test/stub_tile_observer.hpp - test/src/mbgl/test/test.cpp - test/src/mbgl/test/util.cpp - test/src/mbgl/test/util.hpp - # storage test/storage/asset_file_source.test.cpp test/storage/default_file_source.test.cpp @@ -81,6 +65,15 @@ set(MBGL_TEST_FILES test/storage/resource.test.cpp test/storage/sqlite.test.cpp + # style + test/style/filter.test.cpp + test/style/properties.test.cpp + test/style/source.test.cpp + test/style/style.test.cpp + test/style/style_image.test.cpp + test/style/style_layer.test.cpp + test/style/style_parser.test.cpp + # style/conversion test/style/conversion/function.test.cpp test/style/conversion/geojson_options.test.cpp @@ -89,8 +82,9 @@ set(MBGL_TEST_FILES test/style/conversion/stringify.test.cpp test/style/conversion/tileset.test.cpp - # style - test/style/filter.test.cpp + # style/expression + test/style/expression/expression.test.cpp + test/style/expression/util.test.cpp # style/function test/style/function/camera_function.test.cpp @@ -99,23 +93,36 @@ set(MBGL_TEST_FILES test/style/function/interval_stops.test.cpp test/style/function/source_function.test.cpp - # style - test/style/properties.test.cpp - test/style/source.test.cpp - test/style/style.test.cpp - test/style/style_image.test.cpp - test/style/style_layer.test.cpp - test/style/style_parser.test.cpp + # test + test/include/mbgl/test.hpp + test/src/mbgl/test/fake_file_source.hpp + test/src/mbgl/test/fixture_log_observer.cpp + test/src/mbgl/test/fixture_log_observer.hpp + test/src/mbgl/test/getrss.cpp + test/src/mbgl/test/getrss.hpp + test/src/mbgl/test/stub_file_source.cpp + test/src/mbgl/test/stub_file_source.hpp + test/src/mbgl/test/stub_geometry_tile_feature.hpp + test/src/mbgl/test/stub_layer_observer.hpp + test/src/mbgl/test/stub_render_source_observer.hpp + test/src/mbgl/test/stub_style_observer.hpp + test/src/mbgl/test/stub_tile_observer.hpp + test/src/mbgl/test/test.cpp + test/src/mbgl/test/util.cpp + test/src/mbgl/test/util.hpp # text - test/text/glyph_loader.test.cpp + test/text/cross_tile_symbol_index.test.cpp + test/text/glyph_manager.test.cpp test/text/glyph_pbf.test.cpp + test/text/local_glyph_rasterizer.test.cpp test/text/quads.test.cpp # tile - test/tile/annotation_tile.test.cpp + test/tile/custom_geometry_tile.test.cpp test/tile/geojson_tile.test.cpp test/tile/geometry_tile_data.test.cpp + test/tile/raster_dem_tile.test.cpp test/tile/raster_tile.test.cpp test/tile/tile_coordinate.test.cpp test/tile/tile_id.test.cpp @@ -125,6 +132,7 @@ set(MBGL_TEST_FILES test/util/async_task.test.cpp test/util/dtoa.test.cpp test/util/geo.test.cpp + test/util/grid_index.test.cpp test/util/http_timeout.test.cpp test/util/image.test.cpp test/util/mapbox.test.cpp @@ -142,5 +150,7 @@ set(MBGL_TEST_FILES test/util/tile_range.test.cpp test/util/timer.test.cpp test/util/token.test.cpp + test/util/unique_any.test.cpp test/util/url.test.cpp + ) diff --git a/cmake/test.cmake b/cmake/test.cmake index c821d53316..183263c5a9 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -8,10 +8,6 @@ else() ) endif() -target_compile_options(mbgl-test - PRIVATE -fvisibility-inlines-hidden -) - set_source_files_properties(test/src/mbgl/test/util.cpp PROPERTIES COMPILE_FLAGS -DNODE_EXECUTABLE="${NodeJS_EXECUTABLE}") target_include_directories(mbgl-test @@ -27,7 +23,6 @@ target_link_libraries(mbgl-test target_add_mason_package(mbgl-test PRIVATE geometry) target_add_mason_package(mbgl-test PRIVATE variant) -target_add_mason_package(mbgl-test PRIVATE any) target_add_mason_package(mbgl-test PRIVATE unique_resource) target_add_mason_package(mbgl-test PRIVATE rapidjson) target_add_mason_package(mbgl-test PRIVATE gtest) |