git.iko.soy/unity8
on xenial help sign in
Fix greeterdbustest linkage
b5c1857Michael Terry
tests/plugins/IntegratedLightDM/CMakeLists.txt+15−6
compare with xenial
unifiedsplit
@@ -7,13 +7,18 @@ add_executable(GreeterDBusTestExec
7 dbus.cpp
7 dbus.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
9 )
9 )
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)
10qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
13qt5_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+ )
12target_include_directories(GreeterDBusTestExec PUBLIC
18target_include_directories(GreeterDBusTestExec PUBLIC
13 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
19 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
14 ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
20 ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
15 )
21 )
16−set_target_properties(GreeterDBusTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/qml/mocks/IntegratedLightDM/liblightdm")
17install(TARGETS GreeterDBusTestExec
22install(TARGETS GreeterDBusTestExec
18 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
23 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
19)
24)
@@ -23,8 +28,7 @@ install(FILES greeter.qml
23add_unity8_uitest(GreeterDBus dbus-test-runner
28add_unity8_uitest(GreeterDBus dbus-test-runner
24 ARG_PREFIX "--parameter"
29 ARG_PREFIX "--parameter"
25 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
30 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
26− DEPENDS MockLightDM
31+ DEPENDS MockLightDM MockLightDM-qml
27− IMPORT_PATHS ${UNITY_MOCKPATH}
28 LIGHTDM
32 LIGHTDM
29 )
33 )
30
34
@@ -49,14 +53,19 @@ add_executable(GreeterUsersModelTestExec
49 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
53 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
50 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
54 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
51 )
55 )
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)
52qt5_use_modules(GreeterUsersModelTestExec Core Test)
59qt5_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+ )
54target_include_directories(GreeterUsersModelTestExec PUBLIC
64target_include_directories(GreeterUsersModelTestExec PUBLIC
55 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
65 ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
56 ${CMAKE_SOURCE_DIR}/plugins/Utils
66 ${CMAKE_SOURCE_DIR}/plugins/Utils
57 ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
67 ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
58 )
68 )
59−set_target_properties(GreeterUsersModelTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/qml/mocks/IntegratedLightDM/liblightdm")
60install(TARGETS GreeterUsersModelTestExec
69install(TARGETS GreeterUsersModelTestExec
61 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
70 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
62)
71)