on xenial help sign in
enable it only for Unix Makefiles instead of disabling it for ninja
commitb41d17a4e5bacb536767918fcf88fb0aadea3e12 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 17 Mar 2014, 15:53 (13 years ago) parent06c5ff0
1 file changed+2−2
cmake/modules/QmlTest.cmake+2−2
cmake/modules/QmlTest.cmake+2−2
@@ -81,13 +81,14 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
8181 endif()
8282
8383 string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
84− if(cmake_generator_lower STREQUAL "ninja")
84+ if(cmake_generator_lower STREQUAL "unix makefiles")
8585 set(qmltest_command
8686 env ${qmltest_ENVIRONMENT}
8787 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
8888 ${qmltestrunner_imports}
8989 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
9090 -o -,txt
91+ $(FUNCTION)
9192 )
9293 else()
9394 set(qmltest_command
@@ -96,7 +97,6 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
9697 ${qmltestrunner_imports}
9798 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
9899 -o -,txt
99− $(FUNCTION)
100100 )
101101 endif()
102102