git.iko.soy/unity8
on xenial help sign in
Fix lightdm qt version paths
bef09ceJosh Arenson
debian/rules+1−1
compare with xenial
unifiedsplit
@@ -37,6 +37,6 @@ override_dh_install:
37override_dh_makeshlibs:
37override_dh_makeshlibs:
38 dh_makeshlibs -Nunity8-private -Nunity8-fake-env
38 dh_makeshlibs -Nunity8-private -Nunity8-fake-env
39
39
40−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
40+# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist
41override_dh_shlibdeps:
41override_dh_shlibdeps:
42 dh_shlibdeps -XlibMockLightDM-qml.so
42 dh_shlibdeps -XlibMockLightDM-qml.so
plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1
@@ -30,7 +30,7 @@ qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
30
30
31set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
31set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
32set_target_properties(MockLightDM-demo-shared PROPERTIES
32set_target_properties(MockLightDM-demo-shared PROPERTIES
33− OUTPUT_NAME lightdm-qt5-2)
33+ OUTPUT_NAME lightdm-qt5-3)
34
34
35install(TARGETS MockLightDM-demo-shared
35install(TARGETS MockLightDM-demo-shared
36 DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
36 DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
tests/CMakeLists.txt+2−2
@@ -46,8 +46,8 @@ macro(unity8_parse_arguments)
46 set(ld_paths)
46 set(ld_paths)
47 if(U8TEST_LIGHTDM)
47 if(U8TEST_LIGHTDM)
48 list(APPEND ld_paths
48 list(APPEND ld_paths
49− ${UNITY_MOCKPATH}/tests/mocks/libusermetrics
49+ ${UNITY_MOCKPATH}/libusermetrics
50− ${UNITY_MOCKPATH}/tests/mocks/LightDM/IntegratedLightDM/liblightdm
50+ ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
51 )
51 )
52 endif()
52 endif()
53
53