diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-13 18:14:12 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-20 11:56:30 -0700 |
| commit | c8edbb0500cbf4baf1d5fdb0e63679539e166585 (patch) | |
| tree | 750f3b72b9e3b1c91ddbc0541cfc64d7d80ffe71 /cmake | |
| parent | 6d7072162b764c2432c010cd463a5a2c0093d606 (diff) | |
| download | qtlocation-mapboxgl-c8edbb0500cbf4baf1d5fdb0e63679539e166585.tar.gz | |
[core] Replace {Source,Camera,Composite}Function with PropertyExpression
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 4 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 204bb78bce..2aae6e4573 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -368,6 +368,7 @@ set(MBGL_CORE_FILES include/mbgl/style/layer_type.hpp include/mbgl/style/light.hpp include/mbgl/style/position.hpp + include/mbgl/style/property_expression.hpp include/mbgl/style/property_value.hpp include/mbgl/style/source.hpp include/mbgl/style/style.hpp @@ -499,9 +500,6 @@ set(MBGL_CORE_FILES src/mbgl/style/expression/value.cpp # style/function - include/mbgl/style/function/camera_function.hpp - include/mbgl/style/function/composite_function.hpp - include/mbgl/style/function/source_function.hpp src/mbgl/style/function/expression.cpp # style/layers diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 5d76ffcade..1961d78dfc 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -68,6 +68,7 @@ set(MBGL_TEST_FILES # style test/style/filter.test.cpp test/style/properties.test.cpp + test/style/property_expression.test.cpp test/style/source.test.cpp test/style/style.test.cpp test/style/style_image.test.cpp @@ -87,11 +88,6 @@ set(MBGL_TEST_FILES test/style/expression/expression.test.cpp test/style/expression/util.test.cpp - # style/function - test/style/function/camera_function.test.cpp - test/style/function/composite_function.test.cpp - test/style/function/source_function.test.cpp - # test test/include/mbgl/test.hpp test/src/mbgl/test/fake_file_source.hpp |