git.iko.soy/unity8
on xenial help sign in
enable it only for Unix Makefiles instead of disabling it for ninja
b41d17aMichael Zanetti
cmake/modules/QmlTest.cmake+2−2
compare with xenial
unifiedsplit
@@ -81,13 +81,14 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
81 endif()
81 endif()
82
82
83 string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
83 string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
84− if(cmake_generator_lower STREQUAL "ninja")
84+ if(cmake_generator_lower STREQUAL "unix makefiles")
85 set(qmltest_command
85 set(qmltest_command
86 env ${qmltest_ENVIRONMENT}
86 env ${qmltest_ENVIRONMENT}
87 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
87 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
88 ${qmltestrunner_imports}
88 ${qmltestrunner_imports}
89 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
89 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
90 -o -,txt
90 -o -,txt
91+ $(FUNCTION)
91 )
92 )
92 else()
93 else()
93 set(qmltest_command
94 set(qmltest_command
@@ -96,7 +97,6 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
96 ${qmltestrunner_imports}
97 ${qmltestrunner_imports}
97 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
98 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
98 -o -,txt
99 -o -,txt
99− $(FUNCTION)
100 )
100 )
101 endif()
101 endif()
102
102