git.iko.soy/unity8
on xenial help sign in
move some files to a private lib directory
commit31aa5c37c56aaed68f16206eabffeadb6fedcb4a authorDidier Roche <didrocks@ubuntu.com> dateWed 26 Jun 2013, 11:52 (13 years ago) parent7a11dce
7 files changed+16−15
compare with xenial
unifiedsplit
CMakeLists.txt+1 debian/unity8.install+5−5 plugins/HudClient/CMakeLists.txt+2−2 plugins/LightDM/CMakeLists.txt+2−2 plugins/Ubuntu/Gestures/CMakeLists.txt+2−2 plugins/Unity/CMakeLists.txt+2−2 plugins/Utils/CMakeLists.txt+2−2
CMakeLists.txt+1
@@ -57,6 +57,7 @@ find_package(Qt5DBus)
5757include(GNUInstallDirs)
5858
5959set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
60+set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
6061
6162configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
6263
debian/unity8.install+5−5
@@ -13,8 +13,8 @@ usr/share/unity8/Panel
1313usr/share/unity8/Shell.qml
1414usr/share/unity8/SideStage
1515usr/share/unity8/graphics
16−usr/share/unity8/plugins/HudClient
17−usr/share/unity8/plugins/LightDM
18−usr/share/unity8/plugins/Ubuntu
19−usr/share/unity8/plugins/Unity
20−usr/share/unity8/plugins/Utils
16+usr/lib/*/unity8/qml/HudClient
17+usr/lib/*/unity8/qml/LightDM
18+usr/lib/*/unity8/qml/Ubuntu
19+usr/lib/*/unity8/qml/Unity
20+usr/lib/*/unity8/qml/Utils
plugins/HudClient/CMakeLists.txt+2−2
@@ -41,9 +41,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
4141 )
4242
4343install(TARGETS HudClientQml
44− DESTINATION ${SHELL_APP_DIR}/plugins/HudClient
44+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
4545 )
4646
4747install(FILES qmldir
48− DESTINATION ${SHELL_APP_DIR}/plugins/HudClient
48+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
4949 )
plugins/LightDM/CMakeLists.txt+2−2
@@ -35,9 +35,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
3535 )
3636
3737install(TARGETS LightDM-qml
38− DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
38+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
3939 )
4040
4141install(FILES qmldir
42− DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
42+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
4343 )
plugins/Ubuntu/Gestures/CMakeLists.txt+2−2
@@ -27,9 +27,9 @@ add_custom_target(UbuntuGestureQmlDirFile ALL
2727)
2828
2929install(TARGETS UbuntuGestureQml
30− DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
30+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
3131 )
3232
3333install(FILES qmldir
34− DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
34+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
3535 )
plugins/Unity/CMakeLists.txt+2−2
@@ -41,9 +41,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
4141 )
4242
4343install(TARGETS Unity-qml
44− DESTINATION ${SHELL_APP_DIR}/plugins/Unity
44+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
4545 )
4646
4747install(FILES qmldir
48− DESTINATION ${SHELL_APP_DIR}/plugins/Unity
48+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
4949 )
plugins/Utils/CMakeLists.txt+2−2
@@ -28,9 +28,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
2828 )
2929
3030install(TARGETS Utils-qml
31− DESTINATION ${SHELL_APP_DIR}/plugins/Utils
31+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
3232 )
3333
3434install(FILES qmldir
35− DESTINATION ${SHELL_APP_DIR}/plugins/Utils
35+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
3636 )