@@ -80,13 +80,26 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
80 endforeach(IMPORT_PATH)
80 endforeach(IMPORT_PATH)
83+ string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
84+ if(cmake_generator_lower STREQUAL "unix makefiles")
83− set(qmltest_command
85+ set(qmltest_command
84− env ${qmltest_ENVIRONMENT}
86+ env ${qmltest_ENVIRONMENT}
85− ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
87+ ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
86− ${qmltestrunner_imports}
88+ ${qmltestrunner_imports}
87− -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
89+ -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
95+ env ${qmltest_ENVIRONMENT}
96+ ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
97+ ${qmltestrunner_imports}
98+ -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
90 add_custom_target(${qmltest_TARGET} ${qmltest_command})
103 add_custom_target(${qmltest_TARGET} ${qmltest_command})
92 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
105 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")