Fix lightdm qt version paths
commitbef09ceea354839c6dfe22c466866a990977e371
authorJosh Arenson <joshua.arenson@canonical.com>
dateFri 2 Oct 2015, 11:56 (11 years ago)
parent7886722
debian/rules+1−1
@@ -37,6 +37,6 @@ override_dh_install:
3737override_dh_makeshlibs:
3838 dh_makeshlibs -Nunity8-private -Nunity8-fake-env
3939
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
4141override_dh_shlibdeps:
4242 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)
3030
3131set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
3232set_target_properties(MockLightDM-demo-shared PROPERTIES
33− OUTPUT_NAME lightdm-qt5-2)
33+ OUTPUT_NAME lightdm-qt5-3)
3434
3535install(TARGETS MockLightDM-demo-shared
3636 DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
tests/CMakeLists.txt+2−2
@@ -46,8 +46,8 @@ macro(unity8_parse_arguments)
4646 set(ld_paths)
4747 if(U8TEST_LIGHTDM)
4848 list(APPEND ld_paths
49− ${UNITY_MOCKPATH}/tests/mocks/libusermetrics
50− ${UNITY_MOCKPATH}/tests/mocks/LightDM/IntegratedLightDM/liblightdm
49+ ${UNITY_MOCKPATH}/libusermetrics
50+ ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
5151 )
5252 endif()
5353