@@ -3,12 +3,6 @@
33
44# These functions respect the global STDOUT_LOGGER and ARTIFACTS_DIR variables.
55
6−execute_process(
7− COMMAND gcc -dumpmachine
8− OUTPUT_VARIABLE ARCH_TRIPLET
9− OUTPUT_STRIP_TRAILING_WHITESPACE
10−)
11−
126# You can use those with cmake_parse_arguments
137# if you need to wrap and mangle arguments.
148set(QMLTEST_OPTIONS ADD_TEST CACHE INTERNAL "")
@@ -156,7 +150,7 @@ function(add_executable_test COMPONENT_NAME TARGET)
156150 add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}
157151 COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}
158152 ${depends}
159− ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT} LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1
153+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1
160154 TARGETS ${xvfb_targets}
161155 )
162156 endif()