git.iko.soy/unity8
on xenial help sign in
fix wrong merge ^_^
aa864a1Albert Astals
cmake/modules/QmlTest.cmake−1
compare with xenial
unifiedsplit
@@ -147,7 +147,6 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
147endmacro(add_binary_qml_test)
147endmacro(add_binary_qml_test)
148
148
149macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)
149macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)
150−>>>>>>> MERGE-SOURCE
151 add_custom_target(${qmltest_TARGET} ${qmltest_command})
150 add_custom_target(${qmltest_TARGET} ${qmltest_command})
152
151
153 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
152 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")