diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-10 11:34:00 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-15 09:45:55 -0700 |
| commit | da4d735e2c465195e0fb9531ce9d4d7c5c9e6503 (patch) | |
| tree | d7145d5f884420703d0a1bb03a0492eebf05b160 /cmake | |
| parent | 2690a65f8dc9e920c16af3264864321295f7daa8 (diff) | |
| download | qtlocation-mapboxgl-da4d735e2c465195e0fb9531ce9d4d7c5c9e6503.tar.gz | |
[core] Unify {Paint,Layout,Light}Properties
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 3 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index a191061354..f066f28e13 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -192,7 +192,6 @@ set(MBGL_CORE_FILES 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/update_parameters.hpp # renderer/buckets @@ -343,11 +342,11 @@ 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 diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 5eb9d8d9f8..9415add573 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -97,7 +97,7 @@ set(MBGL_TEST_FILES 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 |