diff options
| author | zmiao <miao.zhao@mapbox.com> | 2020-03-10 00:01:34 +0200 |
|---|---|---|
| committer | zmiao <miao.zhao@mapbox.com> | 2020-04-22 15:53:08 +0300 |
| commit | e52f23795d130e3a6f19c39d90c61a707c3de46e (patch) | |
| tree | 9693c271c5b390a668eab7ad81a2a21fdb67f3bb /CMakeLists.txt | |
| parent | 78b09885253f534efceab96e93dd66ef0923cd74 (diff) | |
| download | qtlocation-mapboxgl-e52f23795d130e3a6f19c39d90c61a707c3de46e.tar.gz | |
[core] Introduce distance expression
Add distance unit choices
Fix cmake and add license
Add support for LineString Features
Add template to geometry helper function
Only support line and point
Rename geometry_within.cpp hpp file to geometry_util.cpp .hpp
Remove incorrect indexFilter, fix pointSetsDistance
Fix distance expression
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 583c3df593..6232c7df1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,6 +177,7 @@ add_library( ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/comparison.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/compound_expression.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/dsl.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/distance.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/error.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/expression.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/find_zoom_curve.hpp @@ -569,6 +570,7 @@ add_library( ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/collator_expression.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/comparison.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/compound_expression.cpp + ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/distance.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/dsl.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/dsl_impl.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/expression.cpp @@ -758,8 +760,8 @@ add_library( ${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/geo.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/geojson_impl.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.hpp + ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_util.cpp + ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_util.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/hash.hpp @@ -974,6 +976,7 @@ target_link_libraries( Mapbox::Base::supercluster.hpp Mapbox::Base::shelf-pack-cpp Mapbox::Base::geojson-vt-cpp + Mapbox::Base::cheap-ruler-cpp mbgl-compiler-options mbgl-vendor-boost mbgl-vendor-csscolorparser |