diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 16:39:50 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-02 09:44:42 -0800 |
commit | 141e995806576364d185626176c1b993fc519291 (patch) | |
tree | ecdc41fc7699f2a1a9e9456157348451ebe99597 /cmake | |
parent | 6a6bddb4537004cc1bfc506e76772de74d33f3f7 (diff) | |
download | qtlocation-mapboxgl-141e995806576364d185626176c1b993fc519291.tar.gz |
[core] Add support for data-driven styling
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/core-files.cmake | 23 | ||||
-rw-r--r-- | cmake/test-files.cmake | 6 |
2 files changed, 26 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 6c44117cd8..1059e972ce 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -70,11 +70,13 @@ set(MBGL_CORE_FILES src/mbgl/gl/framebuffer.hpp src/mbgl/gl/gl.cpp src/mbgl/gl/index_buffer.hpp + src/mbgl/gl/normalization.hpp src/mbgl/gl/object.cpp src/mbgl/gl/object.hpp src/mbgl/gl/primitives.hpp src/mbgl/gl/program.hpp src/mbgl/gl/renderbuffer.hpp + src/mbgl/gl/segment.cpp src/mbgl/gl/segment.hpp src/mbgl/gl/state.hpp src/mbgl/gl/stencil_mode.cpp @@ -205,14 +207,15 @@ set(MBGL_CORE_FILES # style include/mbgl/style/conversion.hpp + include/mbgl/style/data_driven_property_value.hpp include/mbgl/style/filter.hpp include/mbgl/style/filter_evaluator.hpp - include/mbgl/style/function.hpp include/mbgl/style/layer.hpp include/mbgl/style/property_value.hpp include/mbgl/style/source.hpp include/mbgl/style/transition_options.hpp include/mbgl/style/types.hpp + include/mbgl/style/undefined.hpp src/mbgl/style/bucket_parameters.cpp src/mbgl/style/bucket_parameters.hpp src/mbgl/style/cascade_parameters.hpp @@ -220,7 +223,7 @@ set(MBGL_CORE_FILES src/mbgl/style/class_dictionary.hpp src/mbgl/style/cross_faded_property_evaluator.cpp src/mbgl/style/cross_faded_property_evaluator.hpp - src/mbgl/style/function.cpp + src/mbgl/style/data_driven_property_evaluator.hpp src/mbgl/style/group_by_layout.cpp src/mbgl/style/group_by_layout.hpp src/mbgl/style/layer.cpp @@ -230,8 +233,10 @@ set(MBGL_CORE_FILES src/mbgl/style/layout_property.hpp src/mbgl/style/observer.hpp src/mbgl/style/paint_property.hpp + src/mbgl/style/paint_property_binder.hpp src/mbgl/style/parser.cpp src/mbgl/style/parser.hpp + src/mbgl/style/possibly_evaluated_property_value.hpp src/mbgl/style/property_evaluation_parameters.hpp src/mbgl/style/property_evaluator.hpp src/mbgl/style/property_parsing.cpp @@ -252,6 +257,7 @@ set(MBGL_CORE_FILES # style/conversion include/mbgl/style/conversion/constant.hpp + include/mbgl/style/conversion/data_driven_property_value.hpp include/mbgl/style/conversion/filter.hpp include/mbgl/style/conversion/function.hpp include/mbgl/style/conversion/geojson.hpp @@ -264,6 +270,17 @@ set(MBGL_CORE_FILES include/mbgl/style/conversion/tileset.hpp src/mbgl/style/conversion/stringify.hpp + # style/function + include/mbgl/style/function/camera_function.hpp + include/mbgl/style/function/categorical_stops.hpp + include/mbgl/style/function/composite_function.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/identity_stops.cpp + # style/layers include/mbgl/style/layers/background_layer.hpp include/mbgl/style/layers/circle_layer.hpp @@ -437,6 +454,7 @@ set(MBGL_CORE_FILES src/mbgl/util/i18n.hpp src/mbgl/util/ignore.hpp src/mbgl/util/indexed_tuple.hpp + src/mbgl/util/interpolate.cpp src/mbgl/util/interpolate.hpp src/mbgl/util/intersection_tests.cpp src/mbgl/util/intersection_tests.hpp @@ -469,6 +487,7 @@ set(MBGL_CORE_FILES src/mbgl/util/tile_cover.cpp src/mbgl/util/tile_cover.hpp src/mbgl/util/token.hpp + src/mbgl/util/type_list.hpp src/mbgl/util/url.cpp src/mbgl/util/url.hpp src/mbgl/util/utf.hpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 76e0857142..2e2c297492 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -77,7 +77,11 @@ set(MBGL_TEST_FILES # style test/style/filter.test.cpp - test/style/functions.test.cpp + + # style/function + test/style/function/camera_function.test.cpp + + # style test/style/group_by_layout.test.cpp test/style/paint_property.test.cpp test/style/source.test.cpp |