diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-16 16:12:09 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-19 12:19:52 -0700 |
| commit | b272605b09ff160859765a161e5c31285466c226 (patch) | |
| tree | 491159bce68bf84d4bd1e699e53193144518b5a8 | |
| parent | 2e5530519e6a56dde019618262ea6ce5c10c72f5 (diff) | |
| download | qtlocation-mapboxgl-upstream/property-expression.tar.gz | |
[core] Move expression.cpp to expression directoryupstream/property-expression
| -rw-r--r-- | cmake/core-files.cmake | 4 | ||||
| -rw-r--r-- | src/mbgl/style/expression/expression.cpp (renamed from src/mbgl/style/function/expression.cpp) | 0 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 2aae6e4573..d2244d14a8 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -484,6 +484,7 @@ set(MBGL_CORE_FILES src/mbgl/style/expression/compound_expression.cpp src/mbgl/style/expression/dsl.cpp src/mbgl/style/expression/equals.cpp + src/mbgl/style/expression/expression.cpp src/mbgl/style/expression/find_zoom_curve.cpp src/mbgl/style/expression/get_covering_stops.cpp src/mbgl/style/expression/interpolate.cpp @@ -499,9 +500,6 @@ set(MBGL_CORE_FILES src/mbgl/style/expression/util.hpp src/mbgl/style/expression/value.cpp - # style/function - src/mbgl/style/function/expression.cpp - # style/layers include/mbgl/style/layers/background_layer.hpp include/mbgl/style/layers/circle_layer.hpp diff --git a/src/mbgl/style/function/expression.cpp b/src/mbgl/style/expression/expression.cpp index d9dbbfa1d3..d9dbbfa1d3 100644 --- a/src/mbgl/style/function/expression.cpp +++ b/src/mbgl/style/expression/expression.cpp |