← Back to branch summary

~jbicha/unity-2d/fix-launcher-quicklist-naming-lp949636

« back to all changes in this revision

Viewing changes to launcher/app/CMakeLists.txt

  • Committer: Florian Boucault
  • Date: 2011-07-14 14:36:53 UTC
  • mto: (574.1.60 unity-2d)
  • mto: This revision was merged to the branch mainline in revision 604.
  • Revision ID: florian@boucault.net-20110714143653-ktnzxuo4ngss40t2
https://launchpad.net/bugs/810509
[launcher] Migrated GConf key /desktop/unity-2d/launcher/super_key_enable to dconf

Added a GSettings schemas file and a GConf-to-GSettings conversion file.

Packaging changes:
* debian/unity-2d.install:
  - install GSettings schemas into usr/share/glib-2.0/schemas
  - install GConf to GSettings conversion into usr/share/GConf/gsettings
* debian/gconf/schemas/unity-2d.schemas:
  - remove GConf schema for /desktop/unity-2d/launcher/super_key_enable
* debian/control:
  - add dependency on libdconf-qt-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/app/CMakeLists.txt
3
3
pkg_check_modules(X11 REQUIRED x11)
4
4
pkg_check_modules(GEIS REQUIRED libutouch-geis)
5
5
pkg_check_modules(QTGCONF REQUIRED libqtgconf)
 
6
pkg_check_modules(DCONFQT REQUIRED dconf-qt)
6
7
 
7
8
# Sources
8
9
set(launcher_SRCS
38
39
    ${X11_INCLUDE_DIRS}
39
40
    ${GEIS_INCLUDE_DIRS}
40
41
    ${QTGCONF_INCLUDE_DIRS}
 
42
    ${DCONFQT_INCLUDE_DIRS}
41
43
    ${libunity-2d-private_SOURCE_DIR}/src
42
44
    )
43
45
 
50
52
    ${X11_LDFLAGS}
51
53
    ${GEIS_LDFLAGS}
52
54
    ${QTGCONF_LDFLAGS}
 
55
    ${DCONFQT_LDFLAGS}
53
56
    unity-2d-private
54
57
    )
55
58