summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/core-files.cmake13
-rw-r--r--cmake/test-files.cmake2
2 files changed, 2 insertions, 13 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 9a26ac70b0..7d7e887a76 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -426,6 +426,7 @@ set(MBGL_CORE_FILES
src/mbgl/style/conversion/constant.cpp
src/mbgl/style/conversion/coordinate.cpp
src/mbgl/style/conversion/filter.cpp
+ src/mbgl/style/conversion/function.cpp
src/mbgl/style/conversion/geojson.cpp
src/mbgl/style/conversion/geojson_options.cpp
src/mbgl/style/conversion/get_json_type.cpp
@@ -454,6 +455,7 @@ set(MBGL_CORE_FILES
include/mbgl/style/expression/compound_expression.hpp
include/mbgl/style/expression/dsl.hpp
include/mbgl/style/expression/equals.hpp
+ include/mbgl/style/expression/error.hpp
include/mbgl/style/expression/expression.hpp
include/mbgl/style/expression/find_zoom_curve.hpp
include/mbgl/style/expression/get_covering_stops.hpp
@@ -498,20 +500,9 @@ set(MBGL_CORE_FILES
# style/function
include/mbgl/style/function/camera_function.hpp
- include/mbgl/style/function/categorical_stops.hpp
- include/mbgl/style/function/composite_categorical_stops.hpp
- include/mbgl/style/function/composite_exponential_stops.hpp
include/mbgl/style/function/composite_function.hpp
- include/mbgl/style/function/composite_interval_stops.hpp
- include/mbgl/style/function/convert.hpp
- include/mbgl/style/function/exponential_stops.hpp
- include/mbgl/style/function/identity_stops.hpp
- include/mbgl/style/function/interval_stops.hpp
include/mbgl/style/function/source_function.hpp
- src/mbgl/style/function/categorical_stops.cpp
- src/mbgl/style/function/convert.cpp
src/mbgl/style/function/expression.cpp
- src/mbgl/style/function/identity_stops.cpp
# style/layers
include/mbgl/style/layers/background_layer.hpp
diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake
index b2c0172d73..5d76ffcade 100644
--- a/cmake/test-files.cmake
+++ b/cmake/test-files.cmake
@@ -90,8 +90,6 @@ set(MBGL_TEST_FILES
# style/function
test/style/function/camera_function.test.cpp
test/style/function/composite_function.test.cpp
- test/style/function/exponential_stops.test.cpp
- test/style/function/interval_stops.test.cpp
test/style/function/source_function.test.cpp
# test