← Back to branch summary

~townsend/unity/fix-waiting-to-install

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Chris Townsend
  • Date: 2013-07-17 16:24:40 UTC
  • mfrom: (3379.1.48 trunk)
  • Revision ID: christopher.townsend@canonical.com-20130717162440-zbeyzlbq0kdvnypo
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
10
10
set (PROJECT_NAME "unity")
11
11
set (UNITY_MAJOR 7)
12
12
set (UNITY_MINOR 0)
13
 
set (UNITY_MICRO 0)
 
13
set (UNITY_MICRO 2)
14
14
set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
15
15
set (UNITY_API_VERSION "6.0")
16
16
set (UNITY_COMPONENTS_VERSION "6")
124
124
       && cmake -DCMAKE_INSTALL_PREFIX=../install -DGSETTINGS_LOCALINSTALL=ON .. -DCMAKE_MODULE_PATH=/usr/share/cmake
125
125
       && make -j4
126
126
       && make -j4 install
127
 
       && make check
 
127
       && make check-headless
128
128
  )
129
129
add_dependencies(distcheck dist)
130
130
 
149
149
set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
150
150
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
151
151
set (PKGDATADIR "${DATADIR}/unity/icons")
 
152
set (SOURCEDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
152
153
set (GETTEXT_PACKAGE "unity")
153
154
set (LOCALE_DIR "${DATADIR}/locale")
154
155
set (VERSION "${UNITY_VERSION}")
211
212
#
212
213
# Compiz Plugins
213
214
#
214
 
set(UNITY_PROTOCOL_PRIVATE_DEPS unity-protocol-private>=7.0.2)
 
215
set(UNITY_PROTOCOL_PRIVATE_DEPS unity-protocol-private>=7.0.8)
215
216
set(UNITY_PLUGIN_SHARED_DEPS
216
217
    ${UNITY_PROTOCOL_PRIVATE_DEPS}
217
218
    atk
244
245
      libgeis
245
246
      x11
246
247
      xfixes
 
248
      xi>=1.6.99.1
247
249
      xrender>=0.9
248
250
  )
249
251
endif ()
269
271
add_subdirectory(doc)
270
272
 
271
273
# Check for google test and build it locally
 
274
set (
 
275
  GMOCK_ROOT_DIR
 
276
  "/usr/src/gmock"
 
277
  CACHE
 
278
  PATH
 
279
  "Path to Google mock srcs"
 
280
)
 
281
 
 
282
set (
 
283
  GMOCK_INCLUDE_DIR
 
284
  "/usr/include/gmock/include"
 
285
  CACHE
 
286
  PATH
 
287
  "Path to Google mock include"
 
288
)
 
289
 
272
290
set(
273
291
  GTEST_ROOT_DIR
274
 
  "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
 
292
  "${GMOCK_ROOT_DIR}/gtest" # Default value, adjustable by user with e.g., ccmake
275
293
  CACHE
276
294
  PATH
277
295
  "Path to Google test srcs"
279
297
 
280
298
set(
281
299
  GTEST_INCLUDE_DIR
282
 
  "/usr/include/gtest"
 
300
  "${GMOCK_ROOT_DIR}/gtest/include"
283
301
  CACHE
284
302
  PATH
285
303
  "Path to Google tests include"
286
304
)
287
305
 
288
 
find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
289
 
if (GTEST_INCLUDE_DIR)
290
 
  #FIXME - hardcoded is bad!
 
306
if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
 
307
  include_directories (
 
308
    ${GMOCK_INCLUDE_DIR}
 
309
    ${GTEST_INCLUDE_DIR}
 
310
  )
291
311
  add_subdirectory(
292
 
    ${GTEST_ROOT_DIR}
293
 
    gtest
294
 
  )
295
 
endif(GTEST_INCLUDE_DIR)
 
312
    ${GMOCK_ROOT_DIR}
 
313
    "${CMAKE_CURRENT_BINARY_DIR}/gmock"
 
314
  )
 
315
elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
 
316
  include_directories (
 
317
    ${GTEST_INCLUDE_DIR}
 
318
  )
 
319
endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
296
320
 
297
321
add_subdirectory(services)
298
322
add_subdirectory(tests)
306
330
# GSettings Schema
307
331
#
308
332
SET (UNITY_SCHEMAS "com.canonical.Unity.gschema.xml")
 
333
SET (UNITY_TEST_SCHEMAS "external.gschema.xml")
309
334
 
310
335
# Have an option to not install the schema into where GLib is
311
336
option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
338
363
 
339
364
# For testing
340
365
configure_file (${CMAKE_SOURCE_DIR}/${UNITY_SCHEMAS} ${CMAKE_BINARY_DIR}/settings/${UNITY_SCHEMAS})
 
366
configure_file (${CMAKE_SOURCE_DIR}/tests/data/${UNITY_TEST_SCHEMAS} ${CMAKE_BINARY_DIR}/settings/${UNITY_TEST_SCHEMAS})
341
367
execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_BINARY_DIR}/settings)
342
368
 
343
369
#