@@ -81,20 +81,29 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
8181 endforeach(IMPORT_PATH)
8282 endif()
8383
84+ string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
85+ if(cmake_generator_lower STREQUAL "unix makefiles")
86+ set(function_ARGS $(FUNCTION))
87+ else()
88+ set(function_ARGS "")
89+ endif()
90+
8491 set(qmltest_command
8592 env ${qmltest_ENVIRONMENT}
8693 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
8794 ${qmltestrunner_imports}
8895 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
8996 -o -,txt
97+ ${function_ARGS}
9098 )
9199 set(qmltest_xvfb_command
92100 env ${qmltest_ENVIRONMENT} LD_PRELOAD=/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1
93101 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
94102 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
95− ${qmltestrunner_imports}
103+ ${qmltestrunner_imports}
96104 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
97105 -o -,txt
106+ ${function_ARGS}
98107 )
99108
100109 add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE)