really install cardcreatortest.js in right place
commit1ed13b67e6f3c7dba3674f0dba80be0f3b1e1e25
authorMichael Terry <michael.terry@canonical.com>
dateThu 28 Apr 2016, 17:29 (11 years ago)
parent3d5fc02
cmake/modules/QmlTest.cmake+3−1
@@ -93,7 +93,9 @@ function(add_qml_test_data PATH COMPONENT_NAME)
9393 file(WRITE "${filename}" "${contents}")
9494 endif()
9595
96− if (NOT DESTINATION)
96+ if (TEST_DESTINATION)
97+ set(DESTINATION "${TEST_DESTINATION}")
98+ else()
9799 file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
98100 set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")
99101 endif()
tests/plugins/Dash/CMakeLists.txt+1−1
@@ -86,7 +86,7 @@ install(TARGETS CardCreatorTestExec
8686 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
8787)
8888add_unity8_uitest(CardCreator CardCreatorTestExec DEPENDS Dash-qml)
89−install(DIRECTORY cardcreator DESTINATION "${SHELL_APP_DIR}/tests/plugins/Dash")
89+add_qml_test_data(. cardcreator)
9090
9191# This one qml file imports a file in an arch-specific directory, so to make its
9292# import line relative, we install it into an arch-specific directory too.