← Back to branch summary

~sil2100/unity-2d/precise-security

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Olivier Tilloy
  • Date: 2011-02-07 17:21:35 UTC
  • mfrom: (359.2.33 maverick)
  • mto: (359.2.43 maverick)
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: olivier.tilloy@canonical.com-20110207172135-qk79mrsxfwqkx2ek
Merge the latest changes from the trunk, resolving conflicts in launcher/app/launcher.cpp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
13
13
# Dependencies
14
14
include(FindPkgConfig)
15
15
find_package(Qt4 REQUIRED)
 
16
find_package(X11 REQUIRED)
16
17
 
17
18
include_directories(
18
19
    ${CMAKE_BINARY_DIR}
22
23
    ${QT_QTDECLARATIVE_INCLUDE_DIR}
23
24
    ${QT_QTXML_INCLUDE_DIR}
24
25
    ${QT_QTGUI_INCLUDE_DIR}
 
26
    ${X11_INCLUDE_DIR}
25
27
    )
26
28
 
 
29
# Tests
 
30
add_custom_target(check)
 
31
 
27
32
# Source
 
33
add_subdirectory(libunity-2d)
28
34
add_subdirectory(launcher)
29
35
add_subdirectory(panel)
30
36
add_subdirectory(places)