[build] Move the `next` buildsystem to the root

This will make the `next` buildsystem no longer the `next`, but the
`actual`. The idea is to simplify the build, removing scripts, to
make the platform buildsystem generated by CMake more compatible
with IDEs and make development more streamlined. It will also make
cross compilation easier.

2 files changed, 39 insertions, 1 deletions

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
new file mode 100644
index 0000000000..a619bfbd36
--- /dev/null
+++ b/benchmark/CMakeLists.txt
@@ -0,0 +1,38 @@
+add_library(
+    mbgl-benchmark STATIC EXCLUDE_FROM_ALL
+    ${PROJECT_SOURCE_DIR}/benchmark/api/query.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/api/render.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/function/camera_function.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/function/composite_function.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/function/source_function.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/parse/filter.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/parse/tile_mask.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/parse/vector_tile.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/src/mbgl/benchmark/benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/storage/offline_database.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/util/dtoa.benchmark.cpp
+    ${PROJECT_SOURCE_DIR}/benchmark/util/tilecover.benchmark.cpp
+)
+
+target_include_directories(
+    mbgl-benchmark
+    PRIVATE ${PROJECT_SOURCE_DIR}/benchmark/src ${PROJECT_SOURCE_DIR}/platform/default/include ${PROJECT_SOURCE_DIR}/src
+)
+
+target_include_directories(
+    mbgl-benchmark
+    PUBLIC ${PROJECT_SOURCE_DIR}/benchmark/include ${PROJECT_SOURCE_DIR}/include
+)
+
+include(${PROJECT_SOURCE_DIR}/vendor/benchmark.cmake)
+
+# Needed for testing private classes
+get_target_property(MBGL_CORE_PRIVATE_LIBRARIES mbgl-core LINK_LIBRARIES)
+
+target_link_libraries(
+    mbgl-benchmark
+    PRIVATE ${MBGL_CORE_PRIVATE_LIBRARIES} mbgl-vendor-benchmark mbgl-compiler-options
+    PUBLIC mbgl-core
+)
+
+set_property(TARGET mbgl-benchmark PROPERTY FOLDER Core)
diff --git a/benchmark/android/app/build.gradle b/benchmark/android/app/build.gradle
index d355286585..d33d19d66f 100644
--- a/benchmark/android/app/build.gradle
+++ b/benchmark/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
     externalNativeBuild {
         cmake {
             version '3.10.2'
-            path '../../../next/CMakeLists.txt'
+            path '../../../CMakeLists.txt'
         }
     }
     buildTypes {