← Back to branch summary

~ci-train-bot/ubuntu-system-settings/ubuntu-system-settings-ubuntu-zesty-1721

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Bileto Bot
  • Author(s): Jonas G. Drange
  • Date: 2016-09-30 13:48:06 UTC
  • mfrom: (1720.3.7 path-fixes)
  • Revision ID: ci-train-bot@canonical.com-20160930134806-tir714ireb8xzaau
uses XDG_DATA_DIRS where applicable to enable USS to find files and folders on snappy-based systems (LP: #1629009)

Approved by: Alberto Mardegan, Ken VanDine, Lukáš Tinkl, system-apps-ci-bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
53
53
find_program(INTLTOOL_MERGE intltool-merge)
54
54
find_program(INTLTOOL_EXTRACT intltool-extract)
55
55
 
56
 
set(PLUGIN_MANIFEST_DIR_BASE share/ubuntu/settings/system)
57
 
set(PLUGIN_MODULE_DIR_BASE ubuntu-system-settings)
58
 
set(PLUGIN_PRIVATE_MODULE_DIR_BASE "${PLUGIN_MODULE_DIR_BASE}/private")
59
 
set(PLUGIN_QML_DIR_BASE share/ubuntu/settings/system/qml-plugins)
 
56
set(DATA_DIR share)
 
57
set(MODULE_DIR ubuntu-system-settings)
 
58
set(MANIFEST_DIR "ubuntu/settings/system")
 
59
set(QML_DIR qml-plugins)
 
60
set(PRIVATE_DIR private)
60
61
 
 
62
# share/ubuntu/settings/system
 
63
set(PLUGIN_MANIFEST_DIR_BASE ${DATA_DIR}/${MANIFEST_DIR})
 
64
# ubuntu-system-settings
 
65
set(PLUGIN_MODULE_DIR_BASE ${MODULE_DIR})
 
66
# ubuntu-system-settings/private
 
67
set(PLUGIN_PRIVATE_MODULE_DIR_BASE "${PLUGIN_MODULE_DIR_BASE}/${PRIVATE_DIR}")
 
68
# share/ubuntu/settings/system/qml-plugins
 
69
set(PLUGIN_QML_DIR_BASE ${DATA_DIR}/${MANIFEST_DIR}/${QML_DIR})
 
70
# E.g. /usr/share/ubuntu/settings/system
61
71
set(PLUGIN_MANIFEST_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_MANIFEST_DIR_BASE}")
 
72
# E.g. /usr/lib/ubuntu-system-settings
62
73
set(PLUGIN_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${PLUGIN_MODULE_DIR_BASE}")
 
74
# E.g. /usr/share/ubuntu/settings/system/qml-plugins
63
75
set(PLUGIN_QML_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_QML_DIR_BASE}")
 
76
# E.g. /usr/lib/ubuntu-system-settings/private
64
77
set(PLUGIN_PRIVATE_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${PLUGIN_PRIVATE_MODULE_DIR_BASE}")
65
78
set(SETTINGS_SHARE_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_MANIFEST_DIR_BASE}")
66
79
set(PUSH_HELPER_DIR "lib/ubuntu-push-client/legacy-helpers")