@@ -7,13 +7,18 @@ add_executable(GreeterDBusTestExec
77 dbus.cpp
88 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
99 )
10+# This add_dependencies is needed since we're linking with with -L and -l below
11+# make seems to work but ninja breaks without it
12+add_dependencies(GreeterDBusTestExec MockLightDM)
1013qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
11−target_link_libraries(GreeterDBusTestExec MockLightDM)
14+target_link_libraries(GreeterDBusTestExec
15+ -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
16+ -llightdm-qt5-2
17+ )
1218target_include_directories(GreeterDBusTestExec PUBLIC
1319 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
1420 ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
1521 )
16−set_target_properties(GreeterDBusTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/qml/mocks/IntegratedLightDM/liblightdm")
1722install(TARGETS GreeterDBusTestExec
1823 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
1924)
@@ -23,8 +28,7 @@ install(FILES greeter.qml
2328add_unity8_uitest(GreeterDBus dbus-test-runner
2429 ARG_PREFIX "--parameter"
2530 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
26− DEPENDS MockLightDM
27− IMPORT_PATHS ${UNITY_MOCKPATH}
31+ DEPENDS MockLightDM MockLightDM-qml
2832 LIGHTDM
2933 )
3034
@@ -49,14 +53,19 @@ add_executable(GreeterUsersModelTestExec
4953 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
5054 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
5155 )
56+# This add_dependencies is needed since we're linking with with -L and -l below
57+# make seems to work but ninja breaks without it
58+add_dependencies(GreeterUsersModelTestExec MockLightDM)
5259qt5_use_modules(GreeterUsersModelTestExec Core Test)
53−target_link_libraries(GreeterUsersModelTestExec MockLightDM)
60+target_link_libraries(GreeterUsersModelTestExec
61+ -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
62+ -llightdm-qt5-2
63+ )
5464target_include_directories(GreeterUsersModelTestExec PUBLIC
5565 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
5666 ${CMAKE_SOURCE_DIR}/plugins/Utils
5767 ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
5868 )
59−set_target_properties(GreeterUsersModelTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/qml/mocks/IntegratedLightDM/liblightdm")
6069install(TARGETS GreeterUsersModelTestExec
6170 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
6271)