1 files changed, 17 insertions, 1 deletions
diff --git a/next/platform/qt/qt.cmake b/next/platform/qt/qt.cmake
index 74cea29efb..44fe442ce2 100644
--- a/next/platform/qt/qt.cmake
+++ b/next/platform/qt/qt.cmake
@@ -165,6 +165,11 @@ add_executable(
     ${MBGL_ROOT}/platform/qt/test/main.cpp
 )
 
+target_include_directories(
+    mbgl-test-runner
+    PUBLIC ${MBGL_ROOT}/include ${MBGL_ROOT}/test/include
+)
+
 target_compile_definitions(
     mbgl-test-runner
     PRIVATE WORK_DIRECTORY=${MBGL_ROOT}
@@ -176,10 +181,21 @@ target_link_libraries(
         Qt5::Gui
         Qt5::OpenGL
         mbgl-compiler-options
-        mbgl-test
         pthread
 )
 
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    target_link_libraries(
+        mbgl-test-runner
+        PRIVATE -Wl,-force_load mbgl-test
+    )
+else()
+    target_link_libraries(
+        mbgl-test-runner
+        PRIVATE -Wl,--whole-archive mbgl-test -Wl,--no-whole-archive
+    )
+endif()
+
 find_program(MBGL_QDOC NAMES qdoc)
 
 if(MBGL_QDOC)