← Back to branch summary

~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to UnityCore/CMakeLists.txt

  • Committer: Neil Jagdish Patel
  • Date: 2011-06-21 12:10:09 UTC
  • mto: This revision was merged to the branch mainline in revision 1244.
  • Revision ID: neil.patel@canonical.com-20110621121009-9873dchryja8chqw
- Rename unity-share to unity-core
- Fix include paths for UnityCore
- Add in all the code that's meant to be shared, update the plugin to look for that code in
  libunity-core
- Tests are disabled again, will fix in next commit
- Update .pc file to reflect new include path

Show diffs side-by-side

added added

removed removed

Lines of Context:
UnityCore/CMakeLists.txt
1
1
find_package (PkgConfig)
2
 
pkg_check_modules (CORE_DEPS REQUIRED glib-2.0 gio-2.0 sigc++-2.0)
 
2
pkg_check_modules (CORE_DEPS REQUIRED glib-2.0 gio-2.0 sigc++-2.0 nux-core-0.9 gdk-pixbuf-2.0)
3
3
 
4
4
#
5
5
# Headers & Sources
6
6
#
7
7
set (CORE_HEADERS
8
 
     Unity.h
 
8
     DBusIndicators.h
 
9
     GLibWrapper.h
 
10
     GLibWrapper-inl.h
 
11
     IndicatorEntry.h
 
12
     Indicator.h
 
13
     Indicators.h
 
14
     UnityCore.h
 
15
     Variant.h
9
16
    )
10
17
 
11
18
set (CORE_SOURCES
12
 
     Unity.cpp
 
19
     DBusIndicators.cpp
 
20
     GLibWrapper.cpp
 
21
     Indicator.cpp
 
22
     IndicatorEntry.cpp
 
23
     Indicators.cpp
 
24
     Variant.cpp
13
25
    )
14
26
 
15
27
#
19
31
     ${CORE_DEPS_CFLAGS}
20
32
     ${CORE_DEPS_CFLAGS_OTHER}
21
33
     ${MAINTAINER_CFLAGS}
 
34
     "-I${CMAKE_BINARY_DIR}"
22
35
     "-DGETTEXT_PACKAGE=\"unity\""
23
36
     "-Werror -Wall"
24
37
     )
46
59
#
47
60
# Headers
48
61
#
49
 
install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${CORE_LIB_NAME}/unity-core)
 
62
install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Unity-${UNITY_API_VERSION}/UnityCore)
50
63
 
51
64
#
52
65
# PkgConfig file