1 files changed, 45 insertions, 13 deletions
diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake
index 7369655630..ac17be559c 100644
--- a/cmake/render-test.cmake
+++ b/cmake/render-test.cmake
@@ -1,30 +1,62 @@
-add_executable(mbgl-render-test
+add_executable(
+    mbgl-render-test
+    expression-test/test_runner_common.cpp
+    expression-test/test_runner_common.hpp
+    platform/default/src/mbgl/render-test/main.cpp
     render-test/allocation_index.cpp
-    render-test/main.cpp
+    render-test/allocation_index.hpp
+    render-test/filesystem.hpp
+    render-test/filesystem.hpp
+    render-test/include/mbgl/render_test.hpp
+    render-test/manifest_parser.cpp
+    render-test/manifest_parser.hpp
+    render-test/metadata.hpp
     render-test/parser.cpp
+    render-test/parser.hpp
+    render-test/render_test.cpp
     render-test/runner.cpp
+    render-test/runner.hpp
 )
 
 if(APPLE)
-    target_link_libraries(mbgl-render-test PRIVATE mbgl-loop-darwin)
+    target_link_libraries(
+        mbgl-render-test
+        PRIVATE mbgl-loop-darwin
+    )
 else()
-    target_link_libraries(mbgl-render-test PRIVATE mbgl-loop-uv)
+    target_link_libraries(
+        mbgl-render-test
+        PRIVATE mbgl-loop-uv
+    )
 endif()
 
-target_include_directories(mbgl-render-test
+target_include_directories(
+    mbgl-render-test
     PRIVATE src
     PRIVATE platform/default/include
     PRIVATE render-test
 )
 
-target_link_libraries(mbgl-render-test PRIVATE
-    mbgl-core
-    mbgl-filesource
-    Mapbox::Base::Extras::args
-    mbgl-vendor-expected
-    Mapbox::Base::Extras::filesystem
-    Mapbox::Base::pixelmatch-cpp
-    Mapbox::Base::Extras::rapidjson
+target_include_directories(
+    mbgl-render-test
+    PUBLIC render-test/include
+    PUBLIC include
 )
 
+target_link_libraries(
+    mbgl-render-test
+    PRIVATE
+        mbgl-core
+        mbgl-filesource
+        Mapbox::Base::Extras::args
+        mbgl-vendor-expected
+        Mapbox::Base::Extras::filesystem
+        Mapbox::Base::pixelmatch-cpp
+        Mapbox::Base::Extras::rapidjson
+)
+
+create_source_groups(mbgl-render-test)
+
+set_target_properties(mbgl-render-test PROPERTIES FOLDER "Executables")
+
 add_definitions(-DTEST_RUNNER_ROOT_PATH="${CMAKE_SOURCE_DIR}")