3 files changed, 68 insertions, 15 deletions
diff --git a/render-test/CMakeLists.txt b/render-test/CMakeLists.txt
new file mode 100644
index 0000000000..914199a7a0
--- /dev/null
+++ b/render-test/CMakeLists.txt
@@ -0,0 +1,52 @@
+add_library(
+    mbgl-render-test STATIC EXCLUDE_FROM_ALL
+    ${PROJECT_SOURCE_DIR}/expression-test/test_runner_common.cpp
+    ${PROJECT_SOURCE_DIR}/expression-test/test_runner_common.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/allocation_index.cpp
+    ${PROJECT_SOURCE_DIR}/render-test/allocation_index.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/file_source.cpp
+    ${PROJECT_SOURCE_DIR}/render-test/file_source.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/filesystem.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/include/mbgl/render_test.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/manifest_parser.cpp
+    ${PROJECT_SOURCE_DIR}/render-test/manifest_parser.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/metadata.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/parser.cpp
+    ${PROJECT_SOURCE_DIR}/render-test/parser.hpp
+    ${PROJECT_SOURCE_DIR}/render-test/render_test.cpp
+    ${PROJECT_SOURCE_DIR}/render-test/runner.cpp
+    ${PROJECT_SOURCE_DIR}/render-test/runner.hpp
+)
+
+if(CMAKE_SYSTEM_NAME STREQUAL iOS)
+    set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}")
+    set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
+    set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE bitcode)
+    set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>)
+endif()
+
+# FIXME: Should not use core private interface
+target_include_directories(
+    mbgl-render-test
+    PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/platform/default/include
+)
+
+target_include_directories(
+    mbgl-render-test
+    PUBLIC ${PROJECT_SOURCE_DIR}/render-test/include ${PROJECT_SOURCE_DIR}/include
+)
+
+include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake)
+
+target_link_libraries(
+    mbgl-render-test
+    PRIVATE
+        Mapbox::Base::Extras::args
+        Mapbox::Base::Extras::filesystem
+        Mapbox::Base::pixelmatch-cpp
+        mbgl-compiler-options
+        mbgl-vendor-boost
+    PUBLIC mbgl-core
+)
+
+set_property(TARGET mbgl-render-test PROPERTY FOLDER Core)
diff --git a/render-test/android/app/build.gradle b/render-test/android/app/build.gradle
index b4d230381e..5b85ea512c 100644
--- a/render-test/android/app/build.gradle
+++ b/render-test/android/app/build.gradle
@@ -34,7 +34,7 @@ android {
     externalNativeBuild {
         cmake {
             version '3.10.2'
-            path '../../../next/CMakeLists.txt'
+            path '../../../CMakeLists.txt'
         }
     }
     buildTypes {
diff --git a/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh
index fbce92f85f..0461622341 100755
--- a/render-test/ios/setup_test_data.sh
+++ b/render-test/ios/setup_test_data.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
-rm -rf ../../test-data
-mkdir ../../test-data
-mkdir ../../test-data/integration
-mkdir ../../test-data/baselines
 
-cp -r ../../mapbox-gl-js/test/integration/render-tests ../../test-data/integration/
-cp -r ../../mapbox-gl-js/test/integration/query-tests ../../test-data/integration/
-cp -r ../../metrics/expectations ../../test-data/
-cp -r ../../metrics/ignores ../../test-data/
-cp -r ../../metrics/tests ../../test-data/
-cp -r ../../metrics/ios-render-test-runner ../../test-data/
-cp -r ../../metrics/ios-render-test-runner-style.json ../../test-data/
-cp -r ../../metrics/ios-render-test-runner-metrics.json ../../test-data/
-cp -r ../../metrics/cache-metrics.db ../../test-data/
-cp -r ../../metrics/cache-style.db ../../test-data/
+rm -rf test-data/
+
+mkdir -p test-data/integration/
+mkdir -p test-data/baselines/
+
+cp -r mapbox-gl-js/test/integration/render-tests test-data/integration/
+cp -r mapbox-gl-js/test/integration/query-tests test-data/integration/
+cp -r metrics/expectations test-data/
+cp -r metrics/ignores test-data/
+cp -r metrics/tests test-data/
+cp -r metrics/ios-render-test-runner test-data/
+cp -r metrics/ios-render-test-runner-style.json test-data/
+cp -r metrics/ios-render-test-runner-metrics.json test-data/
+cp -r metrics/cache-metrics.db test-data/
+cp -r metrics/cache-style.db test-data/