diff options
| author | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2016-08-23 14:57:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 14:57:55 +0200 |
| commit | df3b44531e1c2a95edd2a035d3744f34ebb8d0e9 (patch) | |
| tree | 2eb0ae3e4a3b793767643831cd8063aeab56075d /cmake | |
| parent | 50da6e5e715f0356f430fba176dea13d15fe9d52 (diff) | |
| download | qtlocation-mapboxgl-df3b44531e1c2a95edd2a035d3744f34ebb8d0e9.tar.gz | |
[core] #6071 - extract GeoJSONOptions conversion from GeoJSONSource conversion
* [core] geojson_options - retain original error message
* [core] tests - initial style conversion stub methods
* [core] geojsonoptions conversion - initial unit tests
* [core] tests - fix forward reference issue
* [core] geojsonoptions conversion - unit tests
* [core] geojsonoptions conversion - renamed Holder to Value
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 1 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index d817909e33..e2795072bb 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -256,6 +256,7 @@ set(MBGL_CORE_FILES 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/layer.hpp include/mbgl/style/conversion/make_property_setters.hpp include/mbgl/style/conversion/property_setter.hpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index d6c6215291..4736af6c56 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -42,6 +42,7 @@ set(MBGL_TEST_FILES test/src/main.cpp # src/mbgl/test + test/src/mbgl/test/conversion_stubs.hpp test/src/mbgl/test/fixture_log_observer.cpp test/src/mbgl/test/fixture_log_observer.hpp test/src/mbgl/test/stub_file_source.cpp @@ -72,6 +73,9 @@ set(MBGL_TEST_FILES test/style/style_parser.cpp test/style/tile_source.cpp test/style/variant.cpp + + # style conversion + test/style/conversion/geojson_options.cpp # text test/text/quads.cpp |