diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-09-26 14:14:44 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-23 09:56:43 -0700 |
| commit | 4b2e1cddb4645fb6d2c5f9634dbeb7c21516cede (patch) | |
| tree | f11bd97ea5abf17bc6956f254796f1e8cf4a96f9 /cmake | |
| parent | bb58ddaea8c2d9da9551601318944d9d143ee247 (diff) | |
| download | qtlocation-mapboxgl-4b2e1cddb4645fb6d2c5f9634dbeb7c21516cede.tar.gz | |
Replace compile-time polymorphism with runtime polymorphism in the conversion system
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/benchmark.cmake | 1 | ||||
| -rw-r--r-- | cmake/core-files.cmake | 14 | ||||
| -rw-r--r-- | cmake/node.cmake | 1 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 87351e97b1..623483bedf 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -19,6 +19,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 54b4079cff..7621283e7e 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -370,16 +370,26 @@ set(MBGL_CORE_FILES include/mbgl/style/conversion/geojson_options.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/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/function include/mbgl/style/function/camera_function.hpp diff --git a/cmake/node.cmake b/cmake/node.cmake index c256b13f93..388a98b68f 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 diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 027c34f31e..1aee6223b3 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -51,7 +51,6 @@ set(MBGL_TEST_FILES 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 |