← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Jussi Pakkanen
  • Date: 2012-12-05 14:52:45 UTC
  • mfrom: (2956 trunk)
  • mto: This revision was merged to the branch mainline in revision 2993.
  • Revision ID: jussi.pakkanen@canonical.com-20121205145245-ga2u3xgdagxs1uz7
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
137
137
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE INDICATORDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
138
138
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE INDICATORICONDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
139
139
 
 
140
find_package (PkgConfig)
 
141
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE INDICATORDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
142
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE INDICATORICONDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
143
 
140
144
configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
141
145
 
142
146
#
188
192
    atk-bridge-2.0
189
193
    dbusmenu-glib-0.4
190
194
    dee-1.0
191
 
    gio-2.0
 
195
    gio-2.0>=2.30.0
192
196
    gio-unix-2.0
193
197
    gmodule-2.0
194
198
    gthread-2.0
217
221
  )
218
222
endif ()
219
223
 
220
 
find_package (PkgConfig)
221
224
pkg_check_modules (CACHED_UNITY_DEPS REQUIRED ${UNITY_PLUGIN_DEPS})
222
225
pkg_check_modules (CACHED_UNITY_PRIVATE_DEPS REQUIRED ${UNITY_PROTOCOL_PRIVATE_DEPS})
223
226
add_subdirectory(unity-shared)